I just merged both browserify branches into master. There should be no impact. Right now most specs pass expect for File, FileTransfer, Media and Contacts due to some issues with merges/clobbers and I am looking into those.
Also, I got rid of the project cache condition in plugman that was preventing iOS frameworks from being added (CB-6441) Anis
