diff --git a/bundle/vim-bookmarks/Gemfile b/bundle/vim-bookmarks/Gemfile
deleted file mode 100644
index 8c7228f18..000000000
--- a/bundle/vim-bookmarks/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'octokit'
-gem 'netrc'
-gem 'guard-shell'
-gem 'vim-flavor'
diff --git a/bundle/vim-bookmarks/Gemfile.lock b/bundle/vim-bookmarks/Gemfile.lock
deleted file mode 100644
index 407003714..000000000
--- a/bundle/vim-bookmarks/Gemfile.lock
+++ /dev/null
@@ -1,64 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.5)
-    blankslate (2.1.2.4)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    coderay (1.1.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
-    formatador (0.2.4)
-    guard (2.5.1)
-      formatador (>= 0.2.4)
-      listen (~> 2.6)
-      lumberjack (~> 1.0)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-shell (0.6.1)
-      guard (>= 1.1.0)
-    listen (2.7.1)
-      celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.5)
-    method_source (0.8.2)
-    multipart-post (2.0.0)
-    netrc (0.7.7)
-    nio4r (1.0.0)
-    octokit (2.7.2)
-      sawyer (~> 0.5.2)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (0.9.2.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
-      ffi (>= 0.5.0)
-    sawyer (0.5.3)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    slop (3.5.0)
-    thor (0.19.0)
-    timers (1.1.0)
-    vim-flavor (2.0.0)
-      parslet (~> 1.0)
-      thor (~> 0.14)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  guard-shell
-  netrc
-  octokit
-  rake
-  vim-flavor
diff --git a/bundle/vim-bookmarks/Guardfile b/bundle/vim-bookmarks/Guardfile
deleted file mode 100644
index 06c21530d..000000000
--- a/bundle/vim-bookmarks/Guardfile
+++ /dev/null
@@ -1,5 +0,0 @@
-guard :shell do
-  watch(/(autoload|plugin|t)\/.+\.vim$/) do |m|
-    `rake test`
-  end
-end
diff --git a/bundle/vim-bookmarks/Rakefile b/bundle/vim-bookmarks/Rakefile
deleted file mode 100644
index 44f75b4d8..000000000
--- a/bundle/vim-bookmarks/Rakefile
+++ /dev/null
@@ -1,198 +0,0 @@
-require 'rake/packagetask'
-require 'octokit'
-
-GIT_REPO = "MattesGroeger/vim-bookmarks"
-VIM_SCRIPT_URL = "http://www.vim.org/scripts/add_script_version.php?script_id=4893"
-LABELS = ["feature", "enhancement", "bug"]
-
-task :default => [:release]
-task :ci => [:dump, :test]
-
-desc "Dump version numbers"
-task :dump do
-  sh 'vim --version'
-end
-
-desc "Run tests"
-task :test do
-  sh "bundle exec vim-flavor test"
-end
-
-desc "Create release archive"
-task :release do
-  version = request_user_input("Which version do you want to release (0.1.0)?")
-  file_path = create_zip(version)
-  if request_user_input("Create git release now? (y/n)") == 'y'
-    upload_release(version, file_path)
-  end
-end
-
-desc "See the changelog for a specific version"
-task :changelog do
-  version = request_user_input("For which version (0.1.0)?")
-  show_changelog(version)
-end
-
-def create_zip(version)
-  file_path = "release/vim-bookmarks-#{version}.zip"
-  `mkdir -p release`
-  `zip -r #{file_path} . -i "doc/*" -i "plugin/*" -i "autoload/*" -i LICENSE`
-  file_path
-end
-
-def upload_release(version, asset_path)
-  asset_name = asset_path.split("/")[-1]
-
-  # login to github
-  @client = Octokit::Client.new(netrc: true)
-  @client.login
-
-  # get all milestones
-  milestones = @client.milestones(GIT_REPO)
-  milestone = milestones.select { |m|
-    m.title == version
-  }.first
-  return puts "Unable to find milestone for version #{version}. Aborted!" if !milestone
-
-  # abort if there are still open issues
-  return puts "Found #{milestone.open_issues} open issues for milestone #{version}. Close them first!" if milestone.open_issues > 0
-
-  # get change log via issues
-  issues = @client.issues(GIT_REPO, milestone: milestone.number, state: :closed)
-  changes = build_changelog(issues)
-
-  # get contributor sentence
-  thanks = contributor_sentence_since_last_release()
-
-  # show change log, get it confirmed by user (y/n)
-  changelog = changes.join
-  changelog << "\n#{thanks}" unless thanks.nil?
-  puts "> Changelog:\n#{changelog}\n\n"
-  return puts "Aborted!" if request_user_input("Do you want to create release #{version} with the above changelog? (y/n)", "n").downcase != "y"
-
-  # create release
-  release = @client.create_release(GIT_REPO, version, name: "vim-bookmarks-#{version}", body: changelog)
-  puts "> Created release #{release.name} (id: #{release.id})\n\n"
-
-  # if release exists already:
-  # releases = @client.releases(GIT_REPO)
-  # release = releases.first
-
-  # upload asset
-  release_url = "https://api.github.com/repos/#{GIT_REPO}/releases/#{release.id}"
-  asset = @client.upload_asset(release_url, asset_path, content_type: 'application/zip', name: asset_name)
-  puts "> Uploaded asset #{asset.name} (id: #{asset.id})\n\n"
-
-  # close milestone
-  @client.update_milestone(GIT_REPO, milestone.number, state: :closed)
-  puts "> Closed milestone #{version}. Done!"
-
-  if request_user_input("Update script on vim.org now? (y/n)", "n").downcase == "y"
-    `open "#{VIM_SCRIPT_URL}"`
-  end
-end
-
-def show_changelog(version)
-  # login to github
-  @client = Octokit::Client.new(netrc: true)
-  @client.login
-
-  # get all milestones
-  milestones = @client.milestones(GIT_REPO) + @client.milestones(GIT_REPO, state: :closed)
-  milestone = milestones.select { |m|
-    m.title == version
-  }.first
-  return puts "Unable to find milestone for version #{version}. Aborted!" if !milestone
-
-  # get change log via issues
-  issues = @client.issues(GIT_REPO, milestone: milestone.number, state: :closed)
-
-  # show change log
-  puts "\nChangelog:\n\n#{build_changelog(issues).join}\n"
-end
-
-def build_changelog(issues)
-  issues.map { |i|
-    label = (LABELS & i.labels.map { |l| l.name }).first
-    label_txt = label == "bug" ? "bugfix" : label
-    line = " * [#{label_txt}] #{i.title} ##{i.number}\n" if label
-    {label: label, issue: i.number, line: line}
-  }.select { |f|
-    f[:label] != nil
-  }.sort { |a, b|
-    [LABELS.find_index(a[:label]),b[:issue]] <=> [LABELS.find_index(b[:label]),a[:issue]]
-  }.map { |e|
-    e[:line]
-  }
-end
-
-def contributor_sentence_since_last_release()
-  releases = @client.releases(GIT_REPO)
-  since = releases.size > 0 ? releases.first.created_at : nil
-  contributors = contributors(since)
-  contributor_sentence(contributors)
-end
-
-def contributors(from = nil, to = nil)
-
-  # Get all by default
-  from = Time.new(1).utc.iso8601 if from.nil?
-  to = Time.now.utc.iso8601 if to.nil?
-
-  # Get all commits since last release
-  commits = @client.commits(GIT_REPO, sha: :master, since: from, until: to)
-
-  # Get all collaborators
-  collaborators = @client.collaborators(GIT_REPO).map { |c|
-    c.login
-  }
-
-  # Find all authors that are not site_admin
-  contributor_map = commits.inject({}) { |hash, commit|
-    if commit.author.nil?
-      user = "[#{commit.commit.author.name}](mailto:#{commit.commit.author.email})"
-      hash[user] = 1
-    else
-      login = commit.author.login
-      user = "@#{login}"
-      if collaborators.index(login).nil? # exclude repo maintainer
-        change_count = @client.commit(GIT_REPO, commit.sha).stats.total
-        hash[user] = hash[user].nil? ? change_count : hash[user] + change_count
-      end
-    end
-    hash
-  }
-
-  # Sort them by number of changes (importance)
-  contributor_map.keys.sort { |a, b|
-    contributor_map[b] <=> contributor_map[a]
-  }.map { |c|
-    "#{c}"
-  }
-end
-
-def contributor_sentence(contributors)
-  if contributors.size == 0
-    return nil
-  elsif contributors.size == 1
-    authors = "#{contributors.first} for the contribution"
-  else
-    last = contributors.pop
-    authors = "#{contributors.join(', ')} and #{last} who contributed"
-  end
-  "Thanks #{authors} to this release!"
-end
-
-def request_user_input(message, fallback = "")
-  STDOUT.puts message
-  input = STDIN.gets.strip.to_s
-  if input.empty?
-    if fallback.empty?
-      request_user_input(message) # try again
-    else
-      fallback.to_s
-    end
-  else
-    input.to_s
-  end
-end
diff --git a/bundle/vim-bookmarks/examples/bm-autoload-example.vim b/bundle/vim-bookmarks/examples/bm-autoload-example.vim
index 2c78e3fcc..e6789743b 100644
--- a/bundle/vim-bookmarks/examples/bm-autoload-example.vim
+++ b/bundle/vim-bookmarks/examples/bm-autoload-example.vim
@@ -4,7 +4,7 @@ let s:last_file = ''
 
 function! AddBookmarkRoot(root)
   call add(s:autoload_roots, a:root)
-endfunction!
+endfunction
 
 function! AutoloadBookmarks(file_name)
   let root_is_found = 0
diff --git a/bundle/vim-bookmarks/preview.gif b/bundle/vim-bookmarks/preview.gif
deleted file mode 100644
index 84ce95724..000000000
Binary files a/bundle/vim-bookmarks/preview.gif and /dev/null differ
diff --git a/bundle/vim-bookmarks/release/vim-bookmarks-0.1.0.zip b/bundle/vim-bookmarks/release/vim-bookmarks-0.1.0.zip
deleted file mode 100644
index aff8da5b3..000000000
Binary files a/bundle/vim-bookmarks/release/vim-bookmarks-0.1.0.zip and /dev/null differ
diff --git a/bundle/vim-bookmarks/release/vim-bookmarks-0.2.0.zip b/bundle/vim-bookmarks/release/vim-bookmarks-0.2.0.zip
deleted file mode 100644
index d10493c64..000000000
Binary files a/bundle/vim-bookmarks/release/vim-bookmarks-0.2.0.zip and /dev/null differ
diff --git a/bundle/vim-bookmarks/release/vim-bookmarks-1.0.0.zip b/bundle/vim-bookmarks/release/vim-bookmarks-1.0.0.zip
deleted file mode 100644
index e13f97ccc..000000000
Binary files a/bundle/vim-bookmarks/release/vim-bookmarks-1.0.0.zip and /dev/null differ
diff --git a/bundle/vim-bookmarks/release/vim-bookmarks-1.1.0.zip b/bundle/vim-bookmarks/release/vim-bookmarks-1.1.0.zip
deleted file mode 100644
index a272078ae..000000000
Binary files a/bundle/vim-bookmarks/release/vim-bookmarks-1.1.0.zip and /dev/null differ
diff --git a/bundle/vim-bookmarks/release/vim-bookmarks-1.2.0.zip b/bundle/vim-bookmarks/release/vim-bookmarks-1.2.0.zip
deleted file mode 100644
index f8ec04657..000000000
Binary files a/bundle/vim-bookmarks/release/vim-bookmarks-1.2.0.zip and /dev/null differ
diff --git a/bundle/vim-bookmarks/screenshot-bright-small.png b/bundle/vim-bookmarks/screenshot-bright-small.png
deleted file mode 100644
index 2b1f14152..000000000
Binary files a/bundle/vim-bookmarks/screenshot-bright-small.png and /dev/null differ
diff --git a/bundle/vim-bookmarks/screenshot-bright.png b/bundle/vim-bookmarks/screenshot-bright.png
deleted file mode 100644
index 4d70f16b2..000000000
Binary files a/bundle/vim-bookmarks/screenshot-bright.png and /dev/null differ
diff --git a/bundle/vim-bookmarks/screenshot-unite-interface-actions.png b/bundle/vim-bookmarks/screenshot-unite-interface-actions.png
deleted file mode 100644
index 61ff0dacb..000000000
Binary files a/bundle/vim-bookmarks/screenshot-unite-interface-actions.png and /dev/null differ
diff --git a/bundle/vim-bookmarks/screenshot-unite-interface.png b/bundle/vim-bookmarks/screenshot-unite-interface.png
deleted file mode 100644
index ed5378c91..000000000
Binary files a/bundle/vim-bookmarks/screenshot-unite-interface.png and /dev/null differ