Use cPickle instead of pickle; add additional tests
Merge pull request #446 from edx/will/ai-use-cpickle

Use cPickle instead of pickle; add additional tests