add vim-javascript-syntax plugin: to use JavaScript folding
add conflict-marker plugin
Merge branch 'master' of github.com:kg8m/dotfiles