Merging carl's changes, adding geoet functionality and config.xml configuration