Add grunt install step for travis
Merge branch 'master' into dev