Fix and simplify travis setup.
Merge pull request #48 from brian-brazil/fix-travis

Fix and simplify travis setup.