trying to fix setup for travis
Merge branch 'master' of github.com:mose/greeby