Consolidated logic paths for creating a solr clause
Merge pull request #326 from projecthydra/simplify_logic

Consolidated logic paths for creating a solr clause