Major update
Merge branch 'master' of github.com:x7/dotfiles