Merge from upstream
Merge branch 'master' of github.com:linktohack/vim-snippets

Conflicts:
	UltiSnips/javascript.snippets