cleanup
fix dos line endings
Merge branch 'develop' of https://github.com/jcw/housemon into jcw-develop

Conflicts:
	.gitignore
Merge branch 'jcw-develop' into develop