Merge Vim settings from MacBookPro

Signed-off-by: Kare Nuorteva <kare.nuorteva@me.com>