Only use strings for keys in the solr doc
Restore hybrid delegator until we switch to ActiveFedora 7
Merge pull request #317 from avalonmediasystem/rspec-fun

Fix failing tests