Restore direct modulestore
Merge pull request #263 from edx/zoldak/add-back-direct-modulestore

Restore direct modulestore