Update dotfiles
Merge branch 'master' of github.com:dhahn/dotfiles