[#576] Fix the non-working ostool grantadmin cmd
Merge branch 'master' into 576-ostool-admin
Merge pull request #593 from openspending/576-ostool-admin

Fix up ostool option to grant admin (Fixes #576)
Merge remote-tracking branch 'origin/master' into 552-budget-vs-transaction-countries