Merge functionality for voting and stats into master

The vote branch could use refactoring. However, I haven't been doing it so it's probably worthwhile to at least merge the functionality. If there's anything you'd like to see different in this feature branch before it's merged, let me know.