Fix travis

As of 3:36pm PST, this [branch is green](https://travis-ci.org/brycefisher/rust-http/builds/29795778) on Travis-ci. 

Apologies for messy branch. Do you want me to clean up the history and issue a new PR?