Some work on neater folds, added vim-dispatch and vim-surround