*.conf 4 spaces instead of tabs.
Merge branch 'master' of github.com:brianmcdonnell/dotfiles