Update tex template
Merge branch 'master' of https://github.com/mtimkovich/dotfiles

Conflicts:
	.vim/bundle/vim-golang