added some html snippets
fixed bug in deploy
Merge branch 'master' of github.com:socketwiz/dotfiles

Conflicts:
	.vim/UltiSnips/html.snippets