Playing with caching
Merge branch 'master' of https://github.com/CenterForOpenScience/modular-odm

Conflicts:
	modularodm/StoredObject.py