Mutt confiuration cleanup
Merge branch 'master' of https://github.com/wybczu/dotfiles

Conflicts:
	mutt/mailcap
awesome upgrade - 3.4 -> 3.5