set html ft settings
Merge remote-tracking branch 'origin/master'
Updated vim plugins