Merge branch 'master' into master

diff --combined README.md
index e9966e846c84a345a8eb59fee15bbd0fe2836f15,037ba634efe68876f5ed3590fb0e2716bc7a1db9..bb26e05fa2b5612cf07d33d8958d845fe6dc4d4e
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -293,14 -293,22 +293,30 @@@ If you would like to use a file extensi
  let g:vim_markdown_auto_extension_ext = 'txt'
  ```
  
+ ### Do not automatically insert bulletpoints
+ 
+ Automatically inserting bulletpoints can lead to problems when wrapping text
+ (see issue #232 for details), so it can be disabled:
+ 
+ ```vim
+ let g:vim_markdown_auto_insert_bullets = 0
+ ```
+ 
+ In that case, you probably also want to set the new list item indent to 0 as
+ well, or you will have to remove an indent each time you add a new list item:
+ 
+ ```vim
+ let g:vim_markdown_new_list_item_indent = 0
+ ```
+ 
 +### Change how to open new files
 +
 +By default when following a link the target file will be opened in your current buffer.  This behavior can change if you prefer using splits or tabs by using the `vim_markdown_edit_url_in` variable.  Possible values are `tab`, `vsplit`, `hsplit`, `current` opening in a new tab, vertical split, horizontal split, and current buffer respectively.  Defaults to current buffer if not set:
 +
 +```vim
 +let g:vim_markdown_edit_url_in = 'tab'
 +```
 +
  ## Mappings
  
  The following work on normal and visual modes: