Fixing travis build, cleaning up my mistakes