Merge in 'johnny'.
jd-gui: Clean up a bit.
Merge in 'irpas'.
Merge branch 'master' of https://github.com/BlackArch/blackarch