making government types more uniform, relates to #18
Merge pull request #20 from fgregg/patch-2

making government types more uniform, relates to #18