switch to browserify
manually update browserify branch to include recent changes to master
Merge branch 'browserify2'

Conflicts:
	docs/index.html
	highland.js