Merge branch 'master' of https://github.com/mony960/dotfiles