Stuff I forgot to document
Merge branch 'master' of github.com:bazzel/dotfiles