config file changes
Merge branch 'master' of github.com:mattbischoff/dotfiles