make mailcap actually work
Merge branch 'master' of github.com:xngurevar/dotfiles