fix stylus configuration syntax
use browserify-shim as transform, list browser dependencies in package.json
Merge branch 'master' into angular

Conflicts:
	gulpfile.coffee