vim: Do not launch with global vimrc
Merge remote-tracking branch 'origin/master' into mac