check lua and vim version to use neocomplete
add conflict-marker
Merge branch 'master' of github.com:uskanda/vimrc