Merge from upstream
Merge branch 'master' of github.com:slant/dotfiles
Update subproject hash