Revert "Ensure only one 'mode' is shown in the status bar"

Reverts atom/vim-mode#251

In preference to #302; I simply merged the wrong one.