updating my defaults
Merge branch 'master' of github.com:danielribeiro/dotfiles