Update .gitignore
Merge remote-tracking branch 'origin/master' into development

Conflicts:
	service/emonhub
Merge pull request #42 from otherWIP/master

Merge pull request #2 from emonhub/master
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	service/emonhub