Sad last attempt at fixing solr
Add multimodel fulltext postgres search. Solr was causing massive headaches.
Merge from develop, fixing gem version conflicts