misc changes
Merge branch 'master' of github.com:ryazwinski/Config-Files