vim: Force nocompatible

Without this, all sorts of stuff breaks on my devbox :-(
Merge remote-tracking branch 'origin/master' into mac