Cache the dictionary mapping criteria/points to option IDs
Reorganize assessment model tests.
Merge pull request #361 from edx/will/rubric-options-ids-optimization

Will/rubric options ids optimization