updated and/or removed some vim stuff, I guess