minor code cleanup
minor code cleanup
minor code cleanup
changed dummy config check
massive speedup in config_tools.py
fixed stupid bug (forgot .all())
Merge branch 'master' into 2.x