Merge branch 'master' of github.com:shang-lin/dotfiles