Misc changes
useless
Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/.netrwhist
Merge branch 'master' of https://github.com/JoshWillik/.dotfiles

Conflicts:
	vim/.VimballRecord
	vim/.netrwhist
	vim/doc/tags
	vimrc
	zshrc
readd space collapse toggle