diff --git a/README.md b/README.md
index fe2a72ac..16ddd7ba 100644
--- a/README.md
+++ b/README.md
@@ -369,6 +369,10 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke
  * `Cmd-/` - toggle comments (usually gcc from tComment)
  * `gcp` (comment a paragraph)
 
+ **Wrapping**
+
+ * :Wrap - wrap long lines (e.g. when editing markdown files).
+ * Cmd-[j, k, $, 0, ^] - navigate display lines.
 
 ### Included vim plugins
 
@@ -450,6 +454,11 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke
  * sass-status - decorates your status bar with full nesting of where you are in the sass file
 
 
+### Overriding vim settings
+
+You may use `~/.vimrc.before` for settings like the __leader__ setting. You may `~/.vimrc.after` for any additional overrides/settings.
+
+
 ### Adding your own vim plugins
 
 YADR comes with a dead simple plugin manager that just uses git submodules, without any fancy config files.
diff --git a/vim/after/plugin/vimrc_after.vim b/vim/after/plugin/vimrc_after.vim
new file mode 100644
index 00000000..615d6e69
--- /dev/null
+++ b/vim/after/plugin/vimrc_after.vim
@@ -0,0 +1,10 @@
+" https://github.com/carlhuda/janus/blob/master/janus/vim/core/janus/after/plugin/vimrc_after.vim
+" Customization
+"
+" This loads after the janus plugins so that janus-specific plugin mappings can
+" be overwritten.
+
+if filereadable(expand("~/.vimrc.after"))
+  source ~/.vimrc.after
+endif
+
diff --git a/vim/plugin/settings/README.md b/vim/plugin/settings/README.md
index 875d5027..961db938 100644
--- a/vim/plugin/settings/README.md
+++ b/vim/plugin/settings/README.md
@@ -1,4 +1,9 @@
 This directory contains settings for various vim plugins and vim itself.
 
-For cleanliness, each plugin's overrides/settings should be put into a 
-separate file.
+## Plugin Settings
+
+Each plugin's overrides/settings should be put in a separate file named `{plugin-name}.vim`.
+
+## Vim Settings
+
+General vim overrides/settings should be put in a separate file named `yadr-{descriptive-name}.vim`.
diff --git a/vim/plugin/settings/skwp-appearance.vim b/vim/plugin/settings/yadr-appearance.vim
similarity index 100%
rename from vim/plugin/settings/skwp-appearance.vim
rename to vim/plugin/settings/yadr-appearance.vim
diff --git a/vim/plugin/settings/guioptions.vim b/vim/plugin/settings/yadr-guioptions.vim
similarity index 100%
rename from vim/plugin/settings/guioptions.vim
rename to vim/plugin/settings/yadr-guioptions.vim
diff --git a/vim/plugin/settings/skwp-keymap.vim b/vim/plugin/settings/yadr-keymap.vim
similarity index 99%
rename from vim/plugin/settings/skwp-keymap.vim
rename to vim/plugin/settings/yadr-keymap.vim
index fd5d97fd..d648ff41 100644
--- a/vim/plugin/settings/skwp-keymap.vim
+++ b/vim/plugin/settings/yadr-keymap.vim
@@ -129,7 +129,6 @@ map <silent> <D-6> :tabn 6<cr>
 map <silent> <D-7> :tabn 7<cr>
 map <silent> <D-8> :tabn 8<cr>
 map <silent> <D-9> :tabn 9<cr>
-map <silent> <D-0> :tabn 0<cr>
 
 " Create window splits easier. The default
 " way is Ctrl-w,v and Ctrl-w,s. I remap
@@ -137,7 +136,6 @@ map <silent> <D-0> :tabn 0<cr>
 nnoremap <silent> vv <C-w>v
 nnoremap <silent> ss <C-w>s
 
-
 "open the taglist (method browser) using ,t
 nnoremap <silent> ,T :TlistToggle<CR>
 
diff --git a/vim/plugin/settings/statusline.vim b/vim/plugin/settings/yadr-statusline.vim
similarity index 100%
rename from vim/plugin/settings/statusline.vim
rename to vim/plugin/settings/yadr-statusline.vim
diff --git a/vim/plugin/settings/sudo-write.vim b/vim/plugin/settings/yadr-sudo-write.vim
similarity index 100%
rename from vim/plugin/settings/sudo-write.vim
rename to vim/plugin/settings/yadr-sudo-write.vim
diff --git a/vim/plugin/settings/whitespace-killer.vim b/vim/plugin/settings/yadr-whitespace-killer.vim
similarity index 100%
rename from vim/plugin/settings/whitespace-killer.vim
rename to vim/plugin/settings/yadr-whitespace-killer.vim
diff --git a/vim/plugin/settings/window-killer.vim b/vim/plugin/settings/yadr-window-killer.vim
similarity index 100%
rename from vim/plugin/settings/window-killer.vim
rename to vim/plugin/settings/yadr-window-killer.vim
diff --git a/vim/plugin/settings/yadr-wrapping.vim b/vim/plugin/settings/yadr-wrapping.vim
new file mode 100644
index 00000000..35d514c5
--- /dev/null
+++ b/vim/plugin/settings/yadr-wrapping.vim
@@ -0,0 +1,20 @@
+" http://vimcasts.org/episodes/soft-wrapping-text/
+function! SetupWrapping()
+  set wrap linebreak nolist
+  set showbreak=…
+endfunction
+
+" TODO: this should happen automatically for certain file types (e.g. markdown)
+command! -nargs=* Wrap :call SetupWrapping()<CR>
+
+vmap <D-j> gj
+vmap <D-k> gk
+vmap <D-$> g$
+vmap <D-^> g^
+vmap <D-0> g^
+nmap <D-j> gj
+nmap <D-k> gk
+nmap <D-$> g$
+nmap <D-^> g^
+nmap <D-0> g^
+
diff --git a/vimrc b/vimrc
index 60d2711b..d0f8d958 100644
--- a/vimrc
+++ b/vimrc
@@ -2,6 +2,12 @@
 " This must be first, because it changes other options as a side effect.
 set nocompatible
 
+" TODO: this may not be in the correct place. It is intended to allow overriding <Leader>.
+" source ~/.vimrc.before if it exists.
+if filereadable(expand("~/.vimrc.before"))
+  source ~/.vimrc.before
+endif
+
 " =============== Pathogen Initialization ===============
 " This loads all the plugins in ~/.vim/bundle
 " Use tpope's pathogen plugin to manage all other plugins
@@ -90,3 +96,4 @@ set wildignore+=*vim/backups*
 set scrolloff=8         "Start scrolling when we're 8 lines away from margins
 set sidescrolloff=15
 set sidescroll=1
+