diff --git a/README.md b/README.md
index 716098fb6..4940264ff 100644
--- a/README.md
+++ b/README.md
@@ -240,7 +240,7 @@ Name           | Description
 Name           | Description
 -------------- | ----------------------
 [vimfiler] | Powerful file explorer
-[tinycomment] | Robust but light-weight commenting
+[NERD Commenter] | Comment tool - no comment necessary
 [vinarise] | Hex editor
 [syntastic] | Syntax checking hacks
 [gita] | An awesome git handling plugin
@@ -460,12 +460,15 @@ Key   | Mode | Action
 `Ctrl`+`d` | Insert | Scroll down
 `Ctrl`+`u` | Insert | Scroll up
 
-##### Plugin: TinyComment
+##### Plugin: NERD Commenter
 
 Key   | Mode | Action
 ----- |:----:| ------------------
-`<leader>`+`v` | Normal/visual | Toggle single-line comments
-`<leader>`+`V` | Normal/visual | Toggle comment block
+`<leader>`+`cc` | Normal/visual | Comment out the current line or text selected in visual mode.
+`<leader>`+`cn` | Normal/visual | Same as cc but forces nesting.
+`<leader>`+`cu` | Normal/visual | Uncomments the selected line(s).
+`<leader>`+`cs` | Normal/visual | Comments out the selected lines with a pretty block formatted layout.
+`<leader>`+`cy` | Normal/visual | Same as cc except that the commented line(s) are yanked first.
 
 ##### Plugin: Goyo and Limelight
 
diff --git a/config/plugins/vimfiler.vim b/config/plugins/vimfiler.vim
index ba9e5f9cc..d2289edec 100644
--- a/config/plugins/vimfiler.vim
+++ b/config/plugins/vimfiler.vim
@@ -57,6 +57,7 @@ function! s:vimfilerinit()
     silent! nunmap <buffer> gr
     silent! nunmap <buffer> gf
     silent! nunmap <buffer> -
+    silent! nunmap <buffer> s
 
     nnoremap <silent><buffer> gr  :<C-u>Denite grep:<C-R>=<SID>selected()<CR> -buffer-name=grep<CR>
     nnoremap <silent><buffer> gf  :<C-u>Denite file_rec:<C-R>=<SID>selected()<CR><CR>