lots of changes, updated the vim stuff so everything is in one repo