i3: reorder custom hotkeys to alphabetical order.
vimrc: fix trailing whitespace.
vimrc: clean up bundles.