Tweaks to Discovery input files
Merge branch 'master' of https://github.com/ecocache/ecocache
Discovery code and patch fixes
Merge branch 'master' of https://github.com/ecocache/ecocache