Merge pull request #131 from rgrinberg/master

remove `server` type synonym
add Body.map