Edits from last time
Merge branch 'master' of github.com:twolfson/dotfiles