Created dist versions of config files, added config files to ignore
Merge remote-tracking branch 'origin/master'