some stuff
commit merge
Merge branch 'master' into jake
seeding votes now works but may take awhile