travis: require grunt
Merge branch 'master' into prebuilt

* master:
  travis: require grunt