Merge commit 'rammstein/master'

Conflicts:
	vimrc

diff --combined vimrc
index dd39b5888f486e5ef958cfdb4ea186caa09fdfae,ea0e5f0823e19a69c2e544f730be6b278479c53d..4b166e994d90d06a547ed5a5d12cfd4399e84617
--- 1/vimrc
--- 2/vimrc
+++ b/vimrc
@@@ -81,7 -81,7 +81,7 @@@ set smartcas
  
  " Activate spell checking, use English as default. Don't use spell checking
  " when diffing.
- if v:version >= 700 && !&diff
+ if v:version >= 700 && has('syntax') && !&diff
      set spell
      set spelllang=en_us
  endif
@@@ -141,6 -141,9 +141,9 @@@ nnoremap <Leader>8 :8b<CR
  nnoremap <Leader>9 :9b<CR>
  nnoremap <Leader>0 :10b<CR>
  
+ " Make last active window the only window. Similar to <C-w> o.
+ nnoremap <C-w>O <C-w>p<C-w>o
+ 
  " Maps to change spell language between English and German and disable spell
  " checking.
  if v:version >= 700
@@@ -152,7 -155,7 +155,7 @@@ endi
  " Add semicolon to the end of the line. Thanks to
  " http://www.van-laarhoven.org/vim/.vimrc for this idea and godlygeek in #vim
  " on Freenode for an improved version which doesn't clobber any marks.
- nnoremap <silent> ; :call setline(line('.'), getline('.') . ';')<CR>
+ nnoremap <silent> <Leader>; :call setline(line('.'), getline('.') . ';')<CR>
  
  " I often type "W" instead of "w" when trying to save a file. Fix my mistake.
  " Thanks to Tony Mechelynck <antoine.mechelynck@gmail.com> from the Vim
@@@ -253,12 -256,9 +256,12 @@@ if has('autocmd'
  " backupcopy=auto.
          autocmd FileType crontab setlocal backupcopy=yes
  " Don't use the modeline as the diff created by `git commit -v` may contain
- " one which could change the filetype or other settings of the commit window.
+ " one which could change the filetype or other settings of the commit buffer.
 +" Also make sure we use only 72 characters per line which is the
 +" recommondation for git commit messages (http://tpope.net/node/106).
          autocmd FileType gitcommit setlocal nomodeline |
 -                                 \ let g:secure_modelines_allowed_items = []
 +                                 \ let g:secure_modelines_allowed_items = [] |
 +                                 \ setlocal textwidth=72
  " Allow folding in perl.
          autocmd FileType perl let perl_fold = 1 |
                              \ let perl_fold_blocks = 1