shortcut to edit unmerged files
adding vim-javascript plugin
vim less support