Fixes for clean linting by Grunt, re-enabling Travis builds