A number of changes in an attempt to optimise.
Remove debug logging that was left in.
Merge branch 'andrew-master' into touch_screen_rudimentary

Conflicts resolved:
	Main.elm