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