vim: shortmess = aoOtI

My main motivation for this is to stop the "press enter" prompts, but I
stuck in the rest while I'm here.
Merge remote-tracking branch 'origin/master' into mac