ranger
vim
zshrc
Merge branch 'master' of https://github.com/dthong/config

Conflicts:
	.vim/.netrwhist
	.vim/ftplugin/html_autoclosetag.vim
	.vim/ftplugin/latex-suite/bibtools.pyc
	.vim/ftplugin/latex-suite/brackets.vim
	.vim/ftplugin/latex-suite/outline.pyc
	.vim/plugin/comments.vim
	.vim/plugin/vimacs-0.93.vim
	.vim/snippets/javascript.snippets
	.vim/snippets/python.snippets
	.vim/spell/en.utf-8.add
	.vim/spell/en.utf-8.add.spl
	.zshrc