minor mutt/zsh things
Merge remote-tracking branch 'origin/master'

Conflicts:
	muttrc
zshrc:  hist_ignore_alldups, pushd_ignore_dups
Merge remote-tracking branch 'origin/master' into osx