Merge pull request #1 from mullinsean/riding_edit

Changed electiondata.js to deal with candidate results. Added makefile.