Merge pull request #27 from GoIntegro/feature/api-59-to-one-urls

[API-59] To one relationship URLs
Fixing a really nasty bug.
Moved some more stuff around.