Some cleanup, added travis config