Merge branch 'master' of https://github.com/acperkins/vim

.gitmodules

@@ -34,3 +34,6 @@
 [submodule "bundle/jellybeans.vim"]
 	path = bundle/jellybeans.vim
 	url = https://github.com/nanotech/jellybeans.vim.git
+[submodule "bundle/vim-gnupg"]
+	path = bundle/vim-gnupg
+	url = https://github.com/jamessan/vim-gnupg.git

bundle/vim-gnupg

@@ -0,0 +1 @@
+Subproject commit ccdf455426cd7538de0139ae9d583d2a38ac0e89

vimrc

@@ -7,7 +7,7 @@ nmap <silent> <A-Right> :wincmd l<CR>
 nmap <silent> <A-Up> :wincmd k<CR>
 set autoindent
 set background=dark
-set colorcolumn=72
+set colorcolumn=73
 set cursorcolumn
 set cursorline
 set directory=$TEMP//,/tmp//,.
@@ -17,7 +17,6 @@ set guioptions=c
 set ignorecase
 set linebreak
 set list
-set listchars="tab:> ,trail:$,extends:>,precedes:<,nbsp:+"
 set modelines=0
 set number
 set omnifunc=syntaxcomplete#Complete
@@ -33,6 +32,7 @@ set ttyfast
 set wrap
 silent! colorscheme desert
 silent! filetype plugin indent on
+silent! set foldmethod=syntax
 silent! syntax on
 
 if has("gui_running")