Add travis

Uh, ignore the first two commits, I somehow accidentally added them. Those are part of the other PR