Updated vim stuff, added wombat