Merge pull request #6 from lutaylor/7.x

rename demoFoxmlToSolr to foxmlToSolr. change gsearch_solr to FgsIndex
Index inactive objects for Berkeley Labs.
Merge pull request #7 from jordandukart/7.x-LBL-49

Index inactive objects for Berkeley Labs.
Merge pull request #2 from discoverygarden/7.x

update fork