Add match end of line J/K
remove shit mappings
Merge remote-tracking branch 'takac/master'

Conflicts:
	plugin/EasyMotion.vim

This gets rid of the mappings which conflict with vimdiff