Update to working version of Solr trunk and clean up a few things.