Implement basic disable voting after user votes; re-pull issue #68

This resolves merge conflicts from issue #68