Remove unnecessary uses of ** with dict literals.
Merge branch 'develop' into feature/issue-4-initial-review-miscellany
Remove unnecessary TODO.
Add some voucher table index fields.
Merge branch 'develop' into feature/issue-4-initial-review-miscellany
Merge branch 'feature/issue-4-initial-review-miscellany' into develop