Fix some grunt-contrib-qunit/travis related problem
Revert "Fix some grunt-contrib-qunit/travis related problem"

This reverts commit 837e5ac11a942ac2bfd2250e49e302cea87731ec.
Fix some travis related problem
Merge branch 'master' into gh-pages