fixes to mailcap etc.
Merge branch 'master' of github.com:lbolla/dotfiles