A slew of vim changes, largely plugin related.