various changes...I do not remember
Merge branch 'master' of github.com:espinielli/dotfiles