First attempt at having travis build and deploy
Merge branch 'travis'

Conflicts:
	Gruntfile.js