Fixed a bug...referring to wrong variable after filtering with regexp
Merge branch 'master' of https://github.com/abes975/metasploit-framework into heartbleed
Fixing coding style