Various conf
Merge branch 'master' of github.com:Dunnzilla/dzbin

Conflicts:
	conf/_aliases
Hey look, my email.