updating config files
crazy conflicts tada
Merge branch 'master' of https://github.com/jediscript/lofoco