more stuff
Merge branch 'master' of https://github.com/petrklus/airwellhvac

Conflicts:
	command_parsing/ir_comms.py
Local settings
Merge branch 'master' of https://github.com/petrklus/airwellhvac