diff --git a/.vimrc b/.vimrc
index 61a9855..9a0330a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,14 +1,3 @@
-" An example for a vimrc file.
-"
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2015 Mar 24
-"
-" To use it, copy it to
-"     for Unix and OS/2:  ~/.vimrc
-"	      for Amiga:  s:.vimrc
-"  for MS-DOS and Win32:  $VIM\_vimrc
-"	    for OpenVMS:  sys$login:.vimrc
-
 " When started as "evim", evim.vim will already have done these settings.
 if v:progname =~? "evim"
   finish
@@ -117,3 +106,11 @@ let g:vimwiki_list = [{
   \ 'template_path': '$HOME/vimwiki/html-template',
   \ 'template_default': 'index',
   \ 'template_ext': '.html'}]
+
+" Show trailing whitespace 
+let c_space_errors = 1
+
+" Only use unix mode, and show DOS line endings as ^M
+" This can be disabled with :e ++ff=dos
+set fileformats=unix
+