Updated vimrc with bunch of nice features

- Highlighting for git merge conflict
- Installed YouCompleteMe
- Block movement