Merge pull request #183 from bricknmo/feature/fix_travis_config

Fix broken Travis CI integration
Merge branch 'master' of github.com:tchandy/octopus