Merged scdl_fixes branch:

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