Merge pull request #5 from heiglandreas/travis

Optimizes travis.yml