misc vim changes
Merge remote-tracking branch 'origin/c720' into pc