collect client refactoring pushed to master server Also removed Sunspot Solr search in favor of the new elasticsearch-model and elasticsearch-rails gems