Cleanup up jshint and grunt test errors