Merge branch 'master' of https://github.com/cgie/dotfiles
some changes
some changes