Many cool changes
Merge branch 'master' of github.com:ygt-mikekchar/dotfiles
Fix faulty merge