pull in Charlie's ballot measure edits, closes #1303