I've pulled over files as-is for the most part so this also pulls over some common attribute/secret flags but it's not worth dealing with the merge later...
* Organizations -> orgs consistency * Fix up some tests and some mistaken substitutions
Jeff Mitchell