VIM: removed showmotion shortcuts, added gitgutter
Merge branch 'master' into develop