travis stuff
Merge branch 'master' of github.com:macobo/testing-testing-octoman