Reverting a few stupid changes in Travis-CI conf