Merge branch 'master' of git.friedersdorff.com:max/dotfiles

diff --cc online_mail/.mutt/muttrc
index ea04944a1b7dd7856e28653ddf4d6f30b8fd6d39,8244d8e202fca11d19928218da77a1409b7b4216..3e6e5311e36fc5bfb55209557b08d61c8c828371
--- 1/online_mail/.mutt/muttrc
--- 2/online_mail/.mutt/muttrc
+++ b/online_mail/.mutt/muttrc
@@@ -31,7 -31,7 +31,8 @@@ macro pager \cb   "|urlview\n
  
  set text_flowed=yes
  set reflow_text=yes
 -set editor="vim -v +':set textwidth=72' +'set fo=aw'"
++
 +set editor="vim +':set textwidth=72' +'set fo=aw'"
  
  # Encryption
  source ~/.mutt/gpg.rc