Trying to fix setup and travis
Merge branch 'master' of github.com:eblade/pyroman2