Changes for server-side consistency
Adding ResourceList, and cleaning up publicly visible classes/methods
Changes to get the tests working
Merging changes
Merge pull request #31 from alxdarksage/key-consistency

Key consistency