Removed snipmate from gitmodules, .git/config, and git rm --cached path.  Also fixed vimrc merge conflict