Merge solr joins into our fork

Likely this gets merged into master of sunspot, but until then...