Revert "Simplify travis configuration"

This reverts commit de11cd892c8461ad974b766247bc2fd3dde02f13.

Conflicts:
	.travis.yml