Updated to handle browserify
Merge branch 'master' of github.com:scarletjs/scarlet

Conflicts:
	pub/scarlet.js/index.js