cleanup, grunt-watch => grunt-cli, jshint added

* grunt-watch only seemed to run correctly the first time it was run (0/0
  tests being run with following iterations of watch).