Squashed 'bundle/ultisnips/' content from commit 42a77c5

git-subtree-dir: bundle/ultisnips
git-subtree-split: 42a77c54b2014098067885d7a524820ab6f378ee
Merge commit '8f1c2e6d68a7b776643656470a5fea1565a0e41d' as 'bundle/ultisnips'
Merge branch 'master' of github.com:jupake/myvim

Conflicts:
	vimrc