Merge 'grunt lint' into 'grunt test'