Changed shortcuts
Fixed ace-jump-mode
Merge remote-tracking branch 'upstream/master'