Removed snipmate submodule
Added ultisnips to replace snipmate
Merge branch 'master' into scala

Conflicts:
	.gitmodules