Some more vim tweaks from maximum awesome