making travis setup more reliable
Merge pull request #2 from lutaylor/7.x

making travis setup more reliable
Revert "making travis setup more reliable"
Merge pull request #3 from discoverygarden/revert-2-7.x

Revert "making travis setup more reliable"