Merge pull request #38 from otherWIP/master

Daemon commands & messages
Update .gitignore
Merge pull request #2 from emonhub/master

fix merge conflict