Fixed travis
Merge branch 'master' of https://github.com/nwinter/aether

Conflicts:
	Gruntfile.js
	package.json