Update proximity api with new routes, complete with testing
Merge pull request #155 from kmeurer/master

Update proximity api with new routes, complete with testing