lot of stuff
Merge branch 'master' of github.com:gummiks/dotfiles
lot of stuff 2