remove github, fix some voting functions, prefer user votes
Merge branch 'master' of github.com:blackmad/zetashapes

Conflicts:
	testsite/app/vote_utils.py