Plenty of changes for browserify
Merge remote-tracking branch 'origin/master'
Plenty of changes for browserify