Have to commit before trying git flow
Fixed tests for travis