Merge pull request #42 from tpkelly/develop

Minor fixes
Deleting options now deletes relevant votes
Merge pull request #44 from stevenhillcox/fix/delete-option-votes

Deleting options now deletes relevant votes