Merge commit 'rammstein/master'

Conflicts:

	vimrc

diff --cc vimrc
index b200fa4b63a2710da59db4995b0993cff65a8b47,7d8ebf35f983f408c538fcfee99dcf48cc25dede..95318fec57a3b4afa93f880a4193cf6b214a729d
--- 1/vimrc
--- 2/vimrc
+++ b/vimrc
@@@ -174,8 -173,9 +174,9 @@@ els
  endif
  
  " Make sure xa0 (alt + space) is automatically changed to a normal whitespace
- " if pressed accidentally while in insert mode (happens on Mac sometimes).
+ " if pressed accidentally while in insert mode (happens on Mac when alt
+ " doesn't send escape).
 -if has("mac")
 +if has('mac')
      imap <Char-0xa0> <Space>
  endif