Merge branch 'master' of https://github.com/abes975/metasploit-framework

Conflicts:
	modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
Cleaned up Array.join call
fixed conflict while merging from heartbleed branch
Fixed a bug...referring to wrong variable after filtering with regexp
Merge branch 'master' of https://github.com/abes975/metasploit-framework into heartbleed