Changed some mutt and zsh settings
Merge branch 'master' of github.com:dxtr/dotfiles

Conflicts:
	mutt/muttrc
	zshrc