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

* 'master' of github.com:yramagicman/dotfiles:
Merge branch 'master' of github.com:yramagicman/dotfiles

* 'master' of github.com:yramagicman/dotfiles: