replace easymotion with sneak
update neobundle
upstream merge