Add stuff for travis building and a timeout so tests don't hang