Disable the worst vim feature in the world
My private bash stuff
Merge branch 'master' into edge
Consolidate workspaces