Rework travis script
Merge pull request #812 from Gelmir/travis_next

Rework travis script