diff --git a/.gitmodules b/.gitmodules
index d6dd3ad..e9d5621 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -50,10 +50,6 @@
   path = vim/bundle/scrooloose-syntastic
   url = https://github.com/scrooloose/syntastic.git
   ignore = dirty
-[submodule "vim/bundle/Lokaltog-vim-easymotion"]
-  path = vim/bundle/Lokaltog-vim-easymotion
-  url = https://github.com/Lokaltog/vim-easymotion
-  ignore = dirty
 [submodule "vim/bundle/sjbach-lusty"]
   path = vim/bundle/sjbach-lusty
   url = https://github.com/sjbach/lusty.git
@@ -314,3 +310,6 @@
 [submodule "vim/bundle/tpope-vim-rake"]
 	path = vim/bundle/tpope-vim-rake
 	url = https://github.com/tpope/vim-rake.git
+[submodule "vim/bundle/skwp-vim-easymotion"]
+	path = vim/bundle/skwp-vim-easymotion
+	url = https://github.com/skwp/vim-easymotion
diff --git a/README.md b/README.md
index 20e6674..d745946 100644
--- a/README.md
+++ b/README.md
@@ -301,6 +301,7 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke
  * `,qg/` - quickfix GitGrep last search
  * `,T` - Tag list (list of methods in a class)
  * `Ctrl-s` - Open related spec in a split. Similar to :A and :AV from rails.vim but is also aware of the fast_spec dir and faster to type
+ * `,,w` (alias `,<esc>`) or `,,b` (alias `,<shift-esc>`) - EasyMotion, a vimperator style tool that highlights jump-points on the screen and lets you type to get there.
 
 #### File Navigation
 
@@ -396,7 +397,7 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke
  * NERDTree - everyone's favorite tree browser
  * NERDTree-tabs - makes NERDTree play nice with MacVim tabs so that it's on every tab
  * ShowMarks - creates a visual gutter to the left of the number column showing you your marks
- * EasyMotion - hit ,,w (forward) or ,,b (back) and watch the magic happen. just type the letters and jump directly to your target - in the provided vimrc the keys are optimized for home and upper row, no pinkies
+ * EasyMotion - hit ,<esc> (forward) or ,<Shift-Esc> (back) and watch the magic happen. Just type the letters and jump directly to your target - in the provided vimrc the keys are optimized for home row mostly. Using @skwp modified EasyMotion which uses vimperator-style two character targets.
  * LustyJuggler/Explorer - hit B, type buf name to match a buffer, or type S and use the home row keys to select a buffer
  * TagBar - hit ,T to see a list of methods in a class (uses ctags)
  * CtrlP - Ctrl-p or ,t to find a file
diff --git a/vim/bundle/Lokaltog-vim-easymotion b/vim/bundle/Lokaltog-vim-easymotion
deleted file mode 160000
index 667a668..0000000
--- a/vim/bundle/Lokaltog-vim-easymotion
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 667a668e114e9ec0e5d4cbcb0962d835b23614c4
diff --git a/vim/bundle/skwp-vim-easymotion b/vim/bundle/skwp-vim-easymotion
new file mode 160000
index 0000000..2524ecf
--- /dev/null
+++ b/vim/bundle/skwp-vim-easymotion
@@ -0,0 +1 @@
+Subproject commit 2524ecfa295028c53063c569176d41159f46e78b
diff --git a/vim/plugin/settings/easymotion.vim b/vim/plugin/settings/easymotion.vim
index 956d38a..5abcda6 100644
--- a/vim/plugin/settings/easymotion.vim
+++ b/vim/plugin/settings/easymotion.vim
@@ -4,7 +4,7 @@
 " but it'll all be isolated to one area of the keyboard
 call EasyMotion#InitOptions({
 \   'leader_key'      : '<Leader><Leader>'
-\ , 'keys'            : 'fjdkslewio'
+\ , 'keys'            : 'fjdksewoavn'
 \ , 'do_shade'        : 1
 \ , 'do_mapping'      : 1
 \ , 'grouping'        : 1
@@ -16,3 +16,6 @@ call EasyMotion#InitOptions({
 " Make EasyMotion more yellow, less red
 hi clear EasyMotionTarget
 hi! EasyMotionTarget guifg=yellow
+
+nmap ,<ESC> ,,w
+nmap ,<S-ESC> ,,b