mattdrayer/rebase-20140701: Updated api to support opaque keys
Merge pull request #127 from edx-solutions/mattdrayer/rebase-20140701

mattdrayer/rebase-20140701: Updated api to support opaque keys