Voting actually very broken, first attempt at fix
Merge branch 'r4' of https://github.com/rmcauley/rainwave into r4