Merge pull request #5 from fly/joinvote

dont shortcircuit out the mapvote handler
refactor vote