Merged scdl_fixes branch:

* Fixed tests for contentdm module.
* Modified enrich_subject to remove spaces around double dashes.
Update README.md

fixed couch_database variables names
Merge pull request #1 from eldios/patch-1

Update README.md
Merge branch 'master' into poll_storage