Cleaning up grunt clean
Merge branch 'master' into feature/travis-pushing