Its chriiiistmas
Merge branch 'master' of github.com:jmcomets/dotfiles

Conflicts:
	Vim/UltiSnips/tex.snippets
Submodules