Merge commit 'rammstein/master'

Conflicts:
	vimrc

diff --cc vimrc
index dd39b5888f486e5ef958cfdb4ea186caa09fdfae,ea0e5f0823e19a69c2e544f730be6b278479c53d..4b166e994d90d06a547ed5a5d12cfd4399e84617
--- 1/vimrc
--- 2/vimrc
+++ b/vimrc
@@@ -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