Merge branch 'master'
Minor fixes to some junk
Better link for msf modules
Merge branch 'todb-r7-master'