i3: toggle workspaces and a better shortcut for killing windows.
bashrc: add a gvimdiff alias to stop UBUNTU_MENU_PROXY silliness.