Improve travis-ci usage.
Merge pull request #467 from jobermayr/master

Improve travis-ci usage.