Updating to more modern config.
Merge branch 'master' of github.com:polera/dotfiles