Lots of added vim stuff