aa
Merge remote-tracking branch 'origin/PC' into NB

Conflicts:
	vimrc
remove vimrc.orig
remove EasyMotion and TagHighlight

add multiple-sursors vim-sneak