Update .travis.yml
Merge branch 'master' into issue-172

Conflicts:
	.travis.yml