minor re-organizations
Merge branch 'master' of https://github.com/eaardal/Konfiggy
minor fixes