commented out solr
bundled
commented out gollum
moved sqlite3 to development
commented out solr
removed
various changes
changes
other changes