vim: 7.4.488

Please hold of on merging.  Needs testing :-P  Forgot before I opened the PR.