Add mailcap_linux
Merge branch 'master' of https://github.com/gregdel/dotfiles
Remove virtualenvwrapper from zshrc