Getting rid of obsolete files [Alexandre Dutra]
Adding option to disable Solr completely [Alexandre Dutra]