TravisCI config
Merge branch 'origin/master'

Conflicts:
	.travis.yml