fixed convergence issue, added some old stuff
tweak
start 4 way expansion
Merge branch 'master' of https://github.com/bearblock/hardware

Conflicts:
	touch controller/spice/touch_controller.asc
	touch controller/spice/touch_controller.log
	touch controller/spice/touch_controller.raw