Merges needed were:
* qutebrowser/keyinput/basekeyparser.py for the new count precaution (commit 51aa7ab)
* qutebrowser/keyinput/modeparsers.py for a simple syntax restructure (semantically
identical)
* tests/unit/keyinput/test_basekeyparser.py for new count precaution (commit 51aa7ab)
unit test
* qutebrowser/keyinput/modeman.py for import changes (commit eb8121f)