Improve Travis testing a lot!