Rolled back some watch tasks

Some of the watch tasks were not working fully, and ignoring files in
subfolders. Rolled back to gulp.watch instead of gulp-watch. Also
cleaned up some stray test code. Sorry about that!