A bunch of changes + travis