Add public ballot submission interface #22, and other merge conflict fixes