Merge commit 'epica/master'

diff --combined vimrc
index 95318fec57a3b4afa93f880a4193cf6b214a729d,4da495dccef8218aa0948ace420af49165dceed3..86b49573555e34b4e2eb4f7c90e7d47ff717bcc9
--- 1/vimrc
--- 2/vimrc
+++ b/vimrc
@@@ -84,8 -84,9 +84,9 @@@ endi
  set ignorecase
  set smartcase
  
- " Activate spell checking, use English as default.
- if v:version >= 700
+ " Activate spell checking, use English as default. Don't use spell checking
+ " when diffing.
+ if v:version >= 700 && !&diff
      set spell
      set spelllang=en_us
  endif
@@@ -174,8 -175,7 +175,8 @@@ 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')
      imap <Char-0xa0> <Space>
  endif