Merge branch 'release/2.2' into develop

* release/2.2:
  Update README.rst
Add whitespace detection for airline
Fix whitespace warning in status line
Fix cursor shape in Ubuntu
Replace some plugins
Merge remote-tracking branch 'origin/develop' into develop

* origin/develop:
  Fix cursor shape in Ubuntu
  Fix whitespace warning in status line

Conflicts:
	bundles.vim
Remove change cursorshape for Ubuntu
Add Bitdeli badge
Wrong syntax
Airline configs and tab/buffer shortcuts
Fix shortcut conflict w/ terminal escape sequences
Update new bundles
Misc changes
Update README.rst for 2.3
Merge branch 'release/2.3'

* release/2.3:
  Update README.rst for 2.3
  Misc changes
  Update new bundles
  Fix shortcut conflict w/ terminal escape sequences
  Airline configs and tab/buffer shortcuts
  Wrong syntax
  Add Bitdeli badge
  Remove change cursorshape for Ubuntu
  Replace some plugins
  Fix cursor shape in Ubuntu
  Fix whitespace warning in status line
  Add whitespace detection for airline