Added mutt aliases
Merge branch 'master' into elmo