add a bare and simple preferences dialog
Merge remote-tracking branch 'origin/master'

Conflicts:
	punder.py
Merge branch 'master' into more_advanced_perfs