added indcies and foreign keys for policies and candidates
updated schema to fix merge conflict
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from adambray/master

added indices, foreign_keys, and updated questions controller