merge in upstream master

doc/NERD_commenter.txt

@@ -404,6 +404,8 @@ then the script would do a sexy comment on the last visual selection.
                                       doing visual-block comments.
 |'NERDCommentWholeLinesInVMode'|      Changes behaviour of visual comments.
 |'NERDCreateDefaultMappings'|         Turn the default mappings on/off.
+|'NERDCustomDelimiters'|              Add or override delimiters for any
+                                      filetypes.
 |'NERDDefaultNesting'|                Tells the script to use nested comments
                                       by default.
 |'NERDMenuMode'|                      Specifies how the NERD commenter menu
@@ -553,7 +555,7 @@ Note that this option does not affect the behaviour of commenting in
 |visual-block| mode.
 
 ------------------------------------------------------------------------------
-                                                *'NERDCreateDefaultMappings'*
+                                                 *'NERDCreateDefaultMappings'*
 Values: 0 or 1.
 Default: 1.
 
@@ -561,6 +563,25 @@ If set to 0, none of the default mappings will be created.
 
 See also |NERDComMappings|.
 
+------------------------------------------------------------------------------
+                                                      *'NERDCustomDelimiters'*
+Values: A map (format specified below).
+Default: {}
+
+Use this option if you have new filetypes you want the script to handle, or if
+you want to override the default delimiters of a filetype.
+
+Example: >
+    let g:NERDCustomDelimiters = {
+        \ 'ruby': { 'left': '#', 'leftAlt': 'FOO', 'rightAlt': 'BAR' },
+        \ 'grondle': { 'left': '{{', 'right': '}}' }
+    \ }
+<
+
+Here we override the delimiter settings for ruby and add FOO/BAR as alternative
+delimiters. We also add {{ and }} as delimiters for a new filetype called
+'grondle'.
+
 ------------------------------------------------------------------------------
                                                            *'NERDRemoveAltComs'*
 Values: 0 or 1.
@@ -803,6 +824,15 @@ The latest dev versions are on github
 ==============================================================================
 8. Changelog                                                *NERDComChangelog*
 
+2.3.0
+    - remove all filetypes which have a &commentstring in the standard vim
+      runtime for vim > 7.0 unless the script stores an alternate set of
+      delimiters
+    - make the script complain if the user doesnt have filetype plugins enabled
+    - use <leader> instead of comma to start the default mappings
+    - fix a couple of bugs with sexy comments - thanks to Tim Smart
+    - lots of refactoring
+
 2.2.2
     - remove the NERDShutup option and the message is suppresses, this makes
       the plugin silently rely on &commentstring for unknown filetypes.