Remove deprecated gvimrc.
Merge branch 'master' into i3
Clean up workspaces.  Retain proper order.