[2020] Can only carry 2 weapons but no switch weapon keybind

See title. Currently we need to spend 2 keys on weapon binds, one for the primary and one for the secondary. This is unnecessary, as a single "swap weapon" keybind would be enough. It would also make the "reorder weapon" function redundant. Pressing the "swap weapon" key would switch to the other weapon. (The one that is currently not equipped).