TODO: Fix some items.
Merge branch 'master' of https://github.com/BlackArch/blackarch

Conflicts:
	docs/misc/TODO