Run `grunt jshint` as part of the test step.

* Fix a couple of jshint errors while we are at it.