Merge branch 'master' of https://github.com/noptrix/blackarch into unstable
Strip trailing whitespace from a few packages.
Merge branch 'unstable' of https://github.com/BlackArch/blackarch