A few changes
Merge branch 'master' of https://github.com/mavz42/dotfiles