Add Armitage
Merge pull request #1687 from alias1/newstuff

Add Armitage (v08.21.13)