putting back grunt-cli as dependency for Travis CI

I couldn't manage to make directly node eval to work, so we could avoid
installing grunt-cli only to get grunt-cli.js in the path.
It' a shame, but not the end of the world.
fixing Travis CI integration
Merge branch 'master' into devel

Conflicts:
	.travis.yml