Merge branch 'modal-modifiers'

* modal-modifiers:
  Meaningful error when binding multiple modal keys
  Add modifiers for keys in modal mode
Merge branch 'undo-push'

* undo-push:
  Allow undo for `push` operations