Update ultisnips dir.
Merge branch 'master' of https://github.com/zealotrush/ben_vim

Conflicts:
	vimrc