Merge branch 'hotfix/2.1.1' into develop

* hotfix/2.1.1:
  Update bootstrap url in README.rst
  Prepare for 2.1
Cleanup .gitignore
Some tmux specific changes
Merge remote-tracking branch 'origin/develop' into develop

* origin/develop:
  Cleanup .gitignore
New bundles, misc changes
Merge remote-tracking branch 'origin/develop' into develop

* origin/develop:
  Some tmux specific changes

Conflicts:
	bundles.vim
Misc changes, add hybrid colorscheme
Misc changes to bundles
Move hacks to a new section
Add some highlight hacks
Some SSH slowness fixes
Replace powerline with airline
Update README.rst
Merge branch 'release/2.2'

* release/2.2: (21 commits)
  Update README.rst
  Replace powerline with airline
  Some SSH slowness fixes
  Add some highlight hacks
  Move hacks to a new section
  Misc changes to bundles
  Misc changes, add hybrid colorscheme
  New bundles, misc changes
  Some tmux specific changes
  Cleanup .gitignore
  Update bootstrap url in README.rst
  Prepare for 2.1
  Remove multiple cursor plugin
  Misc keymap changes
  Misc fixes
  Add tomorrow-night and multiple-cursor
  Update bootstrap to reflect repo name change
  Allow option+keys for window movement in iTerm2
  Misc changes
  Add guifont setting fallbacks
  ...
Merge remote-tracking branch 'origin/master'

* origin/master: