These are no longer required after the after.vim hack
Merge branch 'master' into linny