add ternjs vim plugin
add qml syntax highlighting
merge origin/master