powerline symbols
merge conflicts
updated easymotion