diff --git a/.vimrc b/.vimrc
index 3bfae4bf..07b508bd 100644
--- a/.vimrc
+++ b/.vimrc
@@ -14,12 +14,19 @@ endif
 " Enable syntax highlighting
 syntax on
 
+" Set 'nocompatible' to ward off unexpected things that your distro might
+" have made, as well as sanely reset options when re-sourcing .vimrc
+set nocompatible
+
 " Code indentation
 filetype plugin indent on
 set tabstop=4
 set shiftwidth=4
 set expandtab
 
+" Better command-line completion
+set wildmenu
+
 " Highlight searches (use <C-L> to temporarily turn off highlighting; see the
 " mapping of <C-L> below)
 set hlsearch
@@ -28,7 +35,15 @@ set hlsearch
 set ignorecase
 set smartcase
 
+" Stop certain movements from always going to the first character of a line.
+" While this behaviour deviates from that of Vi, it does what most users
+" coming from other editors would expect.
+set nostartofline
+
 " Display the cursor position on the last line of the screen or in the status
 " line of a window
 set ruler
 
+" Instead of failing a command because of unsaved changes, instead raise a
+" dialogue asking if you wish to save changed files.
+set confirm