let's go back to b actually.
Merge branch 'master' of github.com:nwatson/dotfiles