Merge in 'redfang'.
Merge branch 'master' of https://github.com/BlackArch/blackarch