MERGED: emonHub 'emon-pi' V2.0.0 - fixing thread is dead issue

Thanks @dave, the changes displayed are in relation to the proposed changes in the original thread here.

You can now discard these with

git checkout src/emonhub.py
git checkout src/interfacers/EmonHubMqttInterfacer.py

does it list any changes in: src/interfacers/EmonModbusTcpInterfacer.py? is what you copied in the full output?
If so you can also do:

git checkout src/interfacers/EmonModbusTcpInterfacer.py

Or all in one go with a single command:

git checkout .

Then you should be able to follow the steps above.

Thanks