Added tern for vim
Merged remote