Changes to be committed:
	modified:   .gitmodules
	new file:   vimfiles/bundle/syntastic
Merge branch 'master' of github.com:memborg/Vim

Conflicts:
	.gitmodules

 Changes to be committed:
	new file:   .bashrc
	modified:   .gitmodules
	modified:   _vimrc
	new file:   vimfiles/bundle/molokai