making some changes
watchify build now works
Merge branch 'master' into build-WIP
Merge branch 'master' into build-WIP

Conflicts:
	package.json
random phpstorm files
more random phpstorm files
woo got further with build (no type-safety is the devil)
pointing grunt to root app.js
handling underscore templates
switching to grunt-browserify
removing old build script
switching to correct build