Feature/travis improvments