update vimrc
added ultisnips
remove snipmate module
Merge branch 'master' of git://github.com/sursingh/dotvim

Conflicts:
	.gitmodules