Issue #31: Better handling of config files
Merge branch '2.x' of https://github.com/kalamuna/kalastack into 2.x