unifying branches... ugh
fix
minor
Merge branch 'master' into kk

Conflicts:
	kk/Config.py
	kk/Frame.py
	kk/Readme.txt
Yet Another Fix