add FileType for web languages
Macvim use Monaco font
Merge remote-tracking branch 'origin/master'