Land zeroSteiner/metasploit-framework#9 clean up
Do version checking minor cleanup