not using easymotion, removee TMP setting (not sure why I had it initially) and some nmaps for finding scm conflicts
ycm is totally separate now, mappings to fix sneak+yankstack bug