Upgraded browserify
Merge branch 'upgrade-browserify'