More specific js targets in watch
Merge branch 'master' of https://github.com/devbench/devbench.github.io

Conflicts:
	Gruntfile.coffee