Stuff AND things.
Merge branch 'master' of https://github.com/mjcarroll/dotfiles