diffstats aliases and github user
move to dpkg --set-selections format for packages.
Merge branch 'master' of https://github.com/muncus/dotfiles

Conflicts:
	packages.txt
civ and civa