Fix tests on Travis CI
Merge branch 'travis-ci-fix' into grunt

Conflicts:
	Gruntfile.js
	test/index.html