a bunch of migrations, finished the voting results and cleaned up some database relationships. added indexes
fixed merge conflict
Merge pull request #6 from justinhill/master

bunch of stuff