packages.both: Add some items. Sort.
Merge branch 'master' of http://github.com/BlackArch/blackarchiso

Conflicts:
	packages.both