Updated site.pp for proper solr/xmlconfig setup
Update ckan.ini to include correct harvesters
Merged and update ckan.ini