lock yari version
evil scroll-other-window hotkey
upgrade elpa-mirror
Merge remote-tracking branch 'upstream/master'