update travis config to be more concise
remove some commented out code
Merge pull request #915 from reaperhulk/travis-advanced

update travis config to be more concise