Make the default macro for 'swap weapon' be assigned to 'x' instead of 'X'. Closes #860.