Deleted annoying always changing
Merge branch 'master' of github.com:Dunnzilla/dzbin

Conflicts:
	conf/.vim/.netrwhist
More config partying.
Working with both git and cvs on the same machine? This will help your life be in less hell.