some editing
Merge branch 'master' of github.com:giuliop/dotfiles