Simplify npm test to just call grunt, including jshint