Patch for reading config file, and contributor guidelines

A while ago I noticed emonhub spins using a lot of CPU on the emonpi install. Having debugged this and found it's due to a problem whereby we constantly try to reload the config file, I submitted a pull request to fix it. It's now been incorporated into the upstream emonhub (actually with a new, albeit way more minor, bug introduced...), but isn't in the emon-pi version. The lineage between the two isn't clear to me, should I submit a pull request to both when making changes?

Two questions:

  1. Do guidelines exist about how to contribute to the various parts of the project? E.g. will the two versions of emonhub ever get merged back together?
  2. If I want to get straightforward bug fixes into the emonpi image (see https://github.com/emonhub/emonhub/pull/140 for discussion on the issue in question) what's the right way to go about it?

Thanks,

Andy.