undo config.py move
minor update
Merge branch 'kbase' into ff