merge from github, add vim-latex