Merge branch 'master' of github.com:maxf130/dotfiles

Conflicts:
	mutt/.mutt/muttrc

diff --combined mutt/.mutt/muttrc
index 7298addc832d61ec243ed3b31b16d05a2f87148e,4dee74f837d20b69c6c757558ed975f71a7a97e0..e19dc769977d4a7ce5fcae68c62751ca1d9ff21b
--- 1/mutt/.mutt/muttrc
--- 2/mutt/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
@@@ -1,15 -1,12 +1,15 @@@
  # Macro keys for different mailboxes
  macro index <f2> '<sync-mailbox><change-folder>imaps://mail.friedersdorff.com<enter>'
  macro index <f3> '<sync-mailbox><change-folder>imaps://outlook.office365.com<enter>'
 -macro index <f4> '<sync-mailbox><change-folder>imaps://imap.gmail.com<enter>'
 +macro index <f4> '<sync-mailbox><change-folder>imaps://maxf130@imap.gmail.com<enter>'
 +macro index <f5> '<sync-mailbox><change-folder>imaps://max@musoft.co.uk@imap.gmail.com<enter>'
 +
  
  # Configuration files for different mailboxes
  folder-hook 'friedersdorff.com' 'source ~/.mutt/account.com.friedersdorff.max'
  folder-hook 'office365.com' 'source ~/.mutt/account.uk.ac.le.student.mf195'
 -folder-hook 'gmail.com' 'source ~/.mutt/account.com.gmail.maxf130'
 +folder-hook 'maxf130@imap.gmail.com' 'source ~/.mutt/account.com.gmail.maxf130'
 +folder-hook 'max@musoft.co.uk@imap.gmail.com' 'source ~/.mutt/account.uk.co.musoft.max'
  
  macro index 'c' '<change-folder>?<change-dir><home>^K+<enter>'
  
@@@ -30,5 -27,9 +30,9 @@@ set alias_file=~/.mutt/aliase
  set sort_alias= alias
  source $alias_file
  
+ # View urls more easily with urlview
  macro index \cb   "|urlview\n"
  macro pager \cb   "|urlview\n"
+ 
+ set text_flowed=yes
+ set editor="vim +':set textwidth=0' +':set wrapmargin=0' +:set wrap'"