diff --git a/.gitignore b/.gitignore
index 926ccaa..f276604 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 doc/tags
+.netrwhist
diff --git a/README.md b/README.md
index 02bba7f..508b266 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,8 @@
      Bundle 'FuzzyFinder'
      " non github repos
      Bundle 'git://git.wincent.com/command-t.git'
+     " git repos on your local machine (ie. when working on your own plugin)
+     Bundle 'file:///Users/gmarik/path/to/plugin'
      " ...
 
      filetype plugin indent on     " required!
@@ -130,7 +132,7 @@ see [wiki](https://github.com/gmarik/vundle/wiki)
 
 [Vundle]:http://github.com/gmarik/vundle
 [Pathogen]:http://github.com/tpope/vim-pathogen/
-[Bundler]:http://github.com/wycats/bundler/
+[Bundler]:https://github.com/bundler/bundler
 [Vim]:http://www.vim.org
 [Git]:http://git-scm.com
 [all available vim scripts]:http://vim-scripts.org/vim/scripts.html
diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim
index 55c7d7d..5bb6e3f 100644
--- a/autoload/vundle/config.vim
+++ b/autoload/vundle/config.vim
@@ -24,6 +24,9 @@ func! vundle#config#require(bundles) abort
 endf
 
 func! vundle#config#init_bundle(name, opts)
+  if a:name != substitute(a:name, '^\s*\(.\{-}\)\s*$', '\1', '')
+    echo "Spurious leading and/or trailing whitespace found in bundle spec '" . a:name . "'"
+  endif
   let opts = extend(s:parse_options(a:opts), s:parse_name(substitute(a:name,"['".'"]\+','','g')))
   let b = extend(opts, copy(s:bundle))
   let b.rtpath = s:rtpath(opts)
diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim
index eed454e..c0b24f2 100644
--- a/autoload/vundle/installer.vim
+++ b/autoload/vundle/installer.vim
@@ -106,7 +106,10 @@ func! vundle#installer#install(bang, name) abort
 endf
 
 func! vundle#installer#docs() abort
-  call vundle#installer#helptags(g:bundles)
+  let error_count = vundle#installer#helptags(g:bundles)
+  if error_count > 0
+      return 'error'
+  endif
   return 'helptags'
 endf
 
@@ -117,11 +120,12 @@ func! vundle#installer#helptags(bundles) abort
   call s:log('')
   call s:log('Helptags:')
 
-  call map(copy(help_dirs), 's:helptags(v:val)')
+  let statuses = map(copy(help_dirs), 's:helptags(v:val)')
+  let errors = filter(statuses, 'v:val == 0')
 
   call s:log('Helptags: '.len(help_dirs).' bundles processed')
 
-  return help_dirs
+  return len(errors)
 endf
 
 func! vundle#installer#list(bang) abort
@@ -217,7 +221,9 @@ func! s:helptags(rtp) abort
     execute 'helptags ' . doc_path
   catch
     call s:log("> Error running :helptags ".doc_path)
+    return 0
   endtry
+  return 1
 endf
 
 func! s:sync(bang, bundle) abort
diff --git a/doc/vundle.txt b/doc/vundle.txt
index 57e7260..bb4ea4f 100644
--- a/doc/vundle.txt
+++ b/doc/vundle.txt
@@ -46,7 +46,7 @@ in order to install/search [all available vim scripts]
                                                     *vundle-quickstart*
 1) Setup Vundle: >
 
-    git clone http://github.com/gmarik/vundle.git ~/.vim/vundle.git
+    git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
 
 2) Configure bundles:
 
@@ -73,6 +73,8 @@ in order to install/search [all available vim scripts]
      Bundle 'rails.vim'
      " non github repos
      Bundle 'git://git.wincent.com/command-t.git'
+     " git repos on your local machine (ie. when working on your own plugin)
+     Bundle 'file:///Users/gmarik/path/to/plugin'
      " ...
 
      filetype plugin indent on     " required!