Lots of helpful changes to vim