update vim to support emblem syntax and update gitconfig with new email
Merge branch 'master' of github.com:javierav/dotfiles