metasploit: Fix some bugs.
Merge branch 'master' of ssh://github.com/BlackArch/blackarch