Updated vim
Added configuration of diffs
Updated
Merge branch 'master' into optus

* master:
  Updated
  Added configuration of diffs
  Updated vim