Fixed travis settings and some more stuff that I should have tested properly