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