Merge remote branch 'rammstein/master'

diff --combined vimrc
index caa7a023883d0dc0ad2a0ac23e33b53caa260ab1,d0371b559d90896cd8a629b08731fd4c3d5e431c..b0665efb553d9ce198950d1fcc9884fbc8a893cb
--- 1/vimrc
--- 2/vimrc
+++ b/vimrc
@@@ -43,6 -43,11 +43,11 @@@ set nomodelin
  " possible files.
  set wildmode=longest,list
  
+ " Use strong encryption if possible, also used for swap/undo files.
+ if v:version >= 703
+     set cryptmethod=blowfish
+ endif
+ 
  
  " EDIT SETTINGS
  
@@@ -204,11 -209,6 +209,11 @@@ cnoremap <C-n> <down
  nnoremap <Space> <C-f>
  nnoremap - <C-b>
  
 +" Go to next and previous buffer. Thanks to elik in #vim on Freenode
 +" (2010-05-16 18:38) for this idea.
 +nnoremap <silent> gb :bnext<CR>
 +nnoremap <silent> gB :bprev<CR>
 +
  " Fast access to buffers.
  nnoremap <Leader>1 :1b<CR>
  nnoremap <Leader>2 :2b<CR>