merge
trying UltiSnips
Merge branch 'master' of https://github.com/kolja/vimrc

Conflicts:
	vimrc