Revert "Revert "Merge branch 'migrator' of git://github.com/scriptjunkie/metasploit-framework into scriptjunkie-migrator""

This reverts commit 2436ac3a583bdb82944799698a10b6678890bd37.