Highlight easymotion targets
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Highlight easymotion targets
update prezto