commented out solr
Merge branch 'master' of github.com:acando/spirit-4