big cleanup on the Local vs. Global conventions
Finished the Local v. Global policy model. Closes GH-503, Closes GH-616