Browserify alias mapping
Merge branch 'master' of https://github.com/ayamflow/patchwork

Conflicts:
	dev/gulp/tasks/browserify.js