Merge branch 'hotfix/24'

Close #24
Use provided links if available

Signed-off-by: Michael Gooden <michael@bluepointweb.com>
Merge pull request #26 from MichaelGooden/hotfix/render-collection-resource-links

Utilize LinkCollectionAwareInterface when rendering collection resources
Merge branch 'hotfix/26' into develop

Forward port #26