several changes, including warts... almost functional in_place_editor, Solr configuration separation, etc