Add todo aliases

Conflicts:
	zsh/zshrc
Removed trash from mutt
Merge branch 'master' into elmo

Conflicts:
	mutt/muttrc