Merge pull request #362 from gebagley/master

Some final Solr changes
Added the last few hooks for solr and moved the client over to solr search.
Merge pull request #363 from Jedwondle/master

Added the last few hooks for solr and moved the client over to solr search.