Merge branch 'master' of github.com:x1024/dotfiles