+ Ultisnips and fixes
Merge branch 'master' of github.com:grigio/vim-sublime

Conflicts:
	README.md