Merge branch 'master' of https://github.com/kse201/.dotfiles into deploy