Revert to hypermedia.M

See discussions here: https://plus.google.com/u/0/116384151198560836084/posts/HQLB868zbw1?cfem=1
Merge pull request #8 from lostisland/revert_to_sawyer_m

Revert to hypermedia.M