added travis CI support
Merge branch 'travis-ci'

Conflicts:
	Gruntfile.js
	package.json