Added feature to dump to file leaked memory
fixed conflicts, used OptRegexp for pattern
- Rubbish that was left dangling here around
Restored FTP option
Merge branch 'master' of https://github.com/abes975/metasploit-framework

Conflicts:
	modules/auxiliary/scanner/ssl/openssl_heartbleed.rb