Add unit test for and correct parsing of NAT-PMP port map responses
Fix bad merge
Clarify SIP mixin method name, store header values as string, etc
missing exception rescue

needed to also rescue Errno::ETIMEDOUT
Land #3710, pack V* for two elem array

This also fixes #3706
Merge branch 'master' of github.com:rapid7/metasploit-framework
vprint_status when no external address obtained, print_ is too noisy
Land #3545, fix up sip scanners, msftidy, db services cmd
Merge master back in before landing #3545
Correct natpmp_portscan's print_* usage to include peer
Fix a small typo
Land #3687, reworks the nat-pmp portscanner
Switch from pending to skip in specs
cleans up a bunch of spec msftidy issues
Land 3702, prefer be_falsey and cleanup specs
adds better exploit module detection to msftidy
Add a top anchor to the file match regex.
Update sip note format, small tweaks to output, service.info
Merge pull request #12 from todb-r7/commit-hooks-should-only-check-modules

Land 12 from todb, only pre-commit-hook on actual modules
skip examples pending of pivotaltracker 38730815