Fixed funiness that came in with Metasploit update
Merge branch 'master' of https://github.com/staaldraad/metasploit