Post-Canadian Space Agency merge: Replaced ERC with Circe; added ace-jump-mode; added multiple cursors; multiple tweaks, keybindings