Use default ContentFileObject #162 - credit to cwood
Merge pull request #178 from rizumu/contentstorageobject

Use default ContentFileObject #162 - credit to cwood
Merge branch 'master' into reduce-connections

Conflicts:
	cumulus/storage.py