Merge pull request #518 from joshk/patch-1

Use the new build env on Travis
Conflicts:
	.travis.yml