Corrections to ballot and clean up
Merge pull request #15 from pstenbjorn/updates-to-spec

Corrections to ballot and clean up