Added vim-snipmate and some snippets
Merge branch 'master' of github.com:mjacobus/.vimrc

Conflicts:
	.gitmodules
	README.md