Tweaks to Ultisnips config.
Merge branch 'master' of github.com:JCook21/vip

Conflicts:
	.vimrc
Merge branch 'master' of github.com:JCook21/vip