Fix reference + code cleanup
Merge branch 'solr-1' of git.php.net:/pecl/search_engine/solr into solr-1