making settings better
fixing wrong default setting
Merge branch 'devel' of ssh://github.com/touchandgo-devs/touchandgo into devel

Conflicts:
	touchandgo/strategy.py
Merge branch 'devel' of ssh://github.com/touchandgo-devs/touchandgo into devel