More travis config cleanup
Merge pull request #647 from est77/master

More travis config cleanup