changed grunt tasks and fixed lint errors
Merge branch 'master' of https://github.com/alexcheuk/clarify