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