Temp commit, don't push upstream.

Conflicts:
	.travis.yml