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

diff --git a/offline_mail/.mbsync/personal.mbsync b/offline_mail/.mbsync/personal.mbsync
index e5669f8d8ef3be218be7487153a5df8c6133952e..a6d7e20c070f9b0b51332f6dc9fc04989c372871 100644 (file)
--- a/offline_mail/.mbsync/personal.mbsync
+++ b/offline_mail/.mbsync/personal.mbsync
@@ -15,6 +15,6 @@ Inbox ~/mail/personal/Inbox
 Channel personal
 Master :personal-remote:
 Slave :personal-local:
-Patterns "INBOX" "Drafts" "Sent" "Spam" "Trash" "slackware" "todo" "quicknote"
+Patterns "INBOX" "Drafts" "Sent" "Spam" "Trash" "slackware" "quicknote" "todo"
 Create Both
 SyncState *

diff --git a/vim/.vimrc b/vim/.vimrc
index d01c9d80cf6d3c35cbfd63b8e486d0e626364afb..999ce8aa8dd3fb4cac52ed89494af35cb3bb5c63 100644 (file)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -31,6 +31,7 @@ Plugin 'vim-scripts/octave.vim--'
 Plugin 'vim-scripts/MatlabFilesEdition'
 Plugin 'flazz/vim-colorschemes'
 Plugin 'benmills/vimux'
+Plugin 'tmhedberg/SimpylFold'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required