Updated ultisnips
Added js snippets
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vim/UltiSnips/html.snippets
Updated vim plugins