Better travis

@garyb can you review? If what I said in #6 makes sense, I'd like to go this way. If not, let me know.