Fixes a naming mismatch
Cleans up the header a bit.
remove fail, leftover from testing
Fixes notifications for vote, and make them send to right user
merges Voting fixes into master