Revert "testing a simpler travis configuration"

This reverts commit 67938e03f8d8db6ebf2dde3fb0d3c598d1539521.