Revert "Streamline Travis config at @travisci's request"

This reverts commit cfe39851f28253dda2f0f77026523a0052f96080.