New HTML5 snippet + jQuery plugin docblock
Merge branch 'master' of https://github.com/johnnoel/dotfiles

Conflicts:
	.gvimrc