vim: Add :prose for non-code text editing
Merge remote-tracking branch 'origin/master'

* origin/master:
  vim: Disable complaining plugins on my RHEL5 dev server
  Update vim-airline
  Upgrade Janus
  Add dahu/LearnVim