Cleaning up and fixing Travis