Last bit of jscs cleanup

* Allow single line if/else statements
* Clean up last few offenders.
* Add meta grunt task for linting.
* Replace `grunt jshint` with `grunt lint` in the travis build.
Shortened description text to make linter happy.