Fix jslint issues
Update Grunfile to use coffeescript
Merge remote-tracking branch 'origin/master' into updated

Conflicts:
	lib/Model/filter.js
Fix jslint issues