minor cleanup
Merge branch 'master' of github.com:camillobruni/script

Conflicts:
	archey.sh
fixing some ubuntu incompatibilities