removing emacs
Merge branch 'master' of github.com:cunha/dotfiles
update addressbook and dircolors
Merge branch 'master' of github.com:cunha/dotfiles