version bump
Merge git+ssh://github.com/BlackArch/blackarch

Conflicts:
	packages/blackman/PKGBUILD
updated version + style fixes
Merge git+ssh://github.com/BlackArch/blackarch