Final commit that fixes everything for Travis