Use aptitude
Merge branch 'master' of github.com:DanNixon/dotfiles

Conflicts:
	install_packages/packages_essential
	shell/bash_aliases