travis integration
Merge branch 'master' into update-and-travis

Conflicts:
	.travis.yml
	package.json