vim: Add more commonly used keys (jk for write, unmap Q, and file manip)
Merge remote-tracking branch 'origin/master' into mac