A first run at it
Merge branch 'master' of https://github.com/cpmiller/dotfiles