Merge pull request #808 from JasonKriss/map-docs

Fix docs for Adapter's map API
Merge branch 'master' of https://github.com/emberjs/data into terminology-cleanup