Updated static Editor's draft of security vocabulary with Melvin's changes.