Fix jslint issues
Update Grunfile to use coffeescript
Update test according to previous commit

See commit: f4ec2512d7d634cad00bb01f3f3ec218fb89585e
Since the tests in this branch were updated to JS, this commit failed to
pull through and thus the old test failed since it wasn't accurate.
Merge remote-tracking branch 'origin/master' into filter-skip-limit

Conflicts:
	lib/Model/filter.js