merging a fix
Merge branch 'master' of github.com:justinvanwinkle/config-files