use sparkup
Merge branch 'master' of https://github.com/jmjohnson/configs

Conflicts:
	.vimrc
using ultisnips now also removing alternate key binding for sparkup.
configs for ultisnips