Upgrade ergoemacs
Workaround for 'highlight-symbol-prev
Replace git-gutter with git-gutter+