Align with Prezto changes
Round of updates
Use vim over subl for commits
Some more vim upgrade