decode
merge conflicts
Merge branch 'master' of github.com:georgeredinger/housemon

Conflicts:
	briqs/nodeMap-local.coffee
	decode.awk
merge