oh volatile files
Merge remote-tracking branch 'origin/dev'

Conflicts:
	cntrlr.py
	ctrl_vals.db
	firmware/garden/MS561101BA.cpp
	firmware/garden/MS561101BA.h
	firmware/garden/OneWire.cpp
	firmware/garden/OneWire.h
	firmware/garden/aquafarm.ino
	tests/drvr.c