Merge pull request #328 from erickt/hyper-014

Switch to hyper 0.14.x