I must enjoy torturing myself
Merge branch 'master' of github.com:rpdelaney/dotfiles