Changes on my home laptop I forgot to commit.
Merge branch master of github.com:aphahn/dotfiles