Adjusted grunt to uglify, and js watch tasks

Uglify now will minify both the master project.js concatenated
file and any js files not in the concat folder. Watch will now
compile and minify when any file in themes/_s/js/ changes, now including
subfolders.
Merge branch 'master' of github.com:WebDevStudios/wd_s
Merge pull request #11 from CamdenSegal/master

Grunt js improvements