end-to-end fixes
Merge branch 'master' of https://github.com/budleigh/tikkle

Conflicts:
	tikklesettings.sh