mutt updates
Merge branch 'master' of github.com:badgerman/dotfiles

Conflicts:
	mutt/identity.rc