Merge pull request #113 from otherWIP/testing

Testing
Merge pull request #118 from otherWIP/testing

Testing
Merge pull request #122 from otherWIP/testing

Improving Jeelink and RFM2Pi compatability
Merge pull request #124 from otherWIP/testing

Reintroduced float datacode
Cleaner exiting

Make main thread wait until all threads are closed before completing shutdown.
Merge pull request #3 from emonhub/testing

update from upstream