C support, color schemes and :nohls shortcut
	new file:   bundle/cvim/autoload/mmtemplates/core.vim
	new file:   bundle/cvim/c-support/README.csupport
	new file:   bundle/cvim/c-support/codesnippets/Makefile
	new file:   bundle/cvim/c-support/codesnippets/Makefile.multi-target.template
	new file:   bundle/cvim/c-support/codesnippets/Makefile.pro
	new file:   bundle/cvim/c-support/codesnippets/calloc_double_matrix.c
	new file:   bundle/cvim/c-support/codesnippets/calloc_int_matrix.c
	new file:   bundle/cvim/c-support/codesnippets/main.c
	new file:   bundle/cvim/c-support/codesnippets/main.cc
	new file:   bundle/cvim/c-support/codesnippets/print_array.cc.noindent
	new file:   bundle/cvim/c-support/codesnippets/print_double_array.c.noindent
	new file:   bundle/cvim/c-support/codesnippets/print_int_array.c.noindent
	new file:   bundle/cvim/c-support/doc/ChangeLog
	new file:   bundle/cvim/c-support/doc/c-hotkeys.pdf
	new file:   bundle/cvim/c-support/doc/c-hotkeys.tex
	new file:   bundle/cvim/c-support/rc/customization.cpp.vim
	new file:   bundle/cvim/c-support/rc/customization.ctags
	new file:   bundle/cvim/c-support/rc/customization.gvimrc
	new file:   bundle/cvim/c-support/rc/customization.indent.pro
	new file:   bundle/cvim/c-support/rc/customization.vimrc
	new file:   bundle/cvim/c-support/scripts/wrapper.sh
	new file:   bundle/cvim/c-support/templates/Templates
	new file:   bundle/cvim/c-support/templates/c.comments.template
	new file:   bundle/cvim/c-support/templates/c.cpp.template
	new file:   bundle/cvim/c-support/templates/c.idioms.template
	new file:   bundle/cvim/c-support/templates/c.preprocessor.template
	new file:   bundle/cvim/c-support/templates/c.statements.template
	new file:   bundle/cvim/c-support/templates/cpp.comments.template
	new file:   bundle/cvim/c-support/templates/cpp.cpp.template
	new file:   bundle/cvim/c-support/templates/cpp.idioms.template
	new file:   bundle/cvim/c-support/templates/cpp.preprocessor.template
	new file:   bundle/cvim/c-support/templates/cpp.statements.template
	new file:   bundle/cvim/c-support/templates/snippets.template
	new file:   bundle/cvim/c-support/wordlists/c-c++-keywords.list
	new file:   bundle/cvim/c-support/wordlists/k+r.list
	new file:   bundle/cvim/c-support/wordlists/stl_index.list
	new file:   bundle/cvim/doc/csupport.txt
	new file:   bundle/cvim/doc/tags
	new file:   bundle/cvim/doc/templatesupport.txt
	new file:   bundle/cvim/ftplugin/c.vim
	new file:   bundle/cvim/ftplugin/make.vim
	new file:   bundle/cvim/plugin/c.vim
	new file:   bundle/cvim/syntax/template.vim
	new file:   colors/desert256.vim
	new file:   colors/sillymon.vim
	new file:   colors/sillymon_blueconst.vim
	new file:   colors/zenburn.vim
	modified:   vimrc
Merge branch 'master' of https://github.com/mattfield/dotvim

Conflicts:
	colors/zenburn.vim

merge conflict
	modified:   .gitmodules
	new file:   colors/molokai.vim
	modified:   vimrc