initial commit
Merge https://github.com/pullis/Config