severale changes
Merge branch 'master' of github.com:xorphitus/dotfiles