package.json includes requirejs, makefile installs it
Update glob
Improve the error messages for helpers
Merge remote-tracking branch 'soundcloud/master'

Conflicts:
	package.json