Change Ctrl to Primary in accels

This is somewhat a revert for 3ad29b3f, which also changed Primary to
Ctrl.
Merge branch 'master' into city-chooser