Reverted the following commit because we want the old and correct travis.yml back.

Revert "DO NOT MERGE TO MASTER: Removed .travis.yml from this branch because this branch currently fails and I don't want to fix it."

This reverts commit 3886eeec5b8875767cdd3455437629f932aa1894.

Conflicts:
	.travis.yml