Change bindings for ace-jump-mode to s-; (also use ace-jump-char-mode)
Merge remote-tracking branch 'refs/remotes/upstream/master'