update travis
Merge branch 'hotfix/update_travis_to_support_gitflow'