Update ConEmu
Tweak dir colors
Merge branch 'master' of https://github.com/xpando/Dash

Conflicts:
	ConEmu.xml
	ConEmuUpdate.info