Review of functionality after a long period of time.
fix server integration
Merge branch 'master' of https://github.com/the-ramones/solr.git