new file:   .gitignore
	new file:   .vimrc
	new file:   Makefile
	new file:   Makefile.in
	new file:   bundle/.vundle/script-names.vim-scripts.org.json
	new file:   bundle/EasyMotion
	new file:   bundle/Markdown-syntax
	new file:   bundle/SuperTab
	new file:   bundle/html5.vim
	new file:   bundle/jade.vim
	new file:   bundle/less-syntax
	new file:   bundle/less.vim
	new file:   bundle/php.vim
	new file:   bundle/vundle/.netrwhist
	new file:   bundle/vundle/LICENSE-MIT.txt
	new file:   bundle/vundle/README.md
	new file:   bundle/vundle/autoload/vundle.vim
	new file:   bundle/vundle/autoload/vundle/config.vim
	new file:   bundle/vundle/autoload/vundle/installer.vim
	new file:   bundle/vundle/autoload/vundle/scripts.vim
	new file:   bundle/vundle/doc/vundle.txt
	new file:   bundle/vundle/test/files/test.erl
	new file:   bundle/vundle/test/minirc.vim
	new file:   bundle/vundle/test/vimrc
	new file:   compiler/tex.vim
	new file:   doc/Makefile
	new file:   doc/Makefile.in
	new file:   doc/README
	new file:   doc/README.new
	new file:   doc/catalog.xml
	new file:   doc/db2vim/db2vim
	new file:   doc/db2vim/domutils.py
	new file:   doc/db2vim/textutils.py
	new file:   doc/imaps.txt
	new file:   doc/latex-suite-chunk.xsl
	new file:   doc/latex-suite-common.xsl
	new file:   doc/latex-suite-quickstart.css
	new file:   doc/latex-suite-quickstart.txt
	new file:   doc/latex-suite-quickstart.xml
	new file:   doc/latex-suite.css
	new file:   doc/latex-suite.txt
	new file:   doc/latex-suite.xml
	new file:   doc/latex-suite.xsl
	new file:   doc/latexhelp.txt
	new file:   ftdetect/less.vim
	new file:   ftplugin/less.vim
	new file:   indent/less.vim
	new file:   latextags
	new file:   ltags
	new file:   plugin/SyntaxFolds.vim
	new file:   plugin/filebrowser.vim
	new file:   plugin/imaps.vim
	new file:   plugin/libList.vim
	new file:   plugin/remoteOpen.vim
	new file:   syntax/less.vim
Merge branch 'master' of https://github.com/silenter/vimfiles

Conflicts:
	bundle/vundle

	new file:   .gitmodules
	new file:   bundle/VimClojure
	deleted:    bundle/vundle/.netrwhist
	deleted:    bundle/vundle/LICENSE-MIT.txt
	deleted:    bundle/vundle/README.md
	deleted:    bundle/vundle/autoload/vundle.vim
	modified:   bundle/vundle/autoload/vundle/config.vim
	modified:   bundle/vundle/autoload/vundle/installer.vim
	deleted:    bundle/vundle/autoload/vundle/scripts.vim
	deleted:    bundle/vundle/doc/vundle.txt
	deleted:    bundle/vundle/test/files/test.erl
	deleted:    bundle/vundle/test/minirc.vim
	deleted:    bundle/vundle/test/vimrc
Merge branch 'master' of https://github.com/silenter/vimfiles
	new file:   bundle/vundle/.gitignore
	new file:   bundle/vundle/LICENSE-MIT.txt
	new file:   bundle/vundle/README.md
	new file:   bundle/vundle/autoload/vundle.vim
	new file:   bundle/vundle/autoload/vundle/scripts.vim
	new file:   bundle/vundle/doc/vundle.txt
	new file:   bundle/vundle/test/files/test.erl
	new file:   bundle/vundle/test/minirc.vim
	new file:   bundle/vundle/test/vimrc