Merge branch 'master' of github.com:dellsystem/mcmun-2014
Update number of awards to show in admin

Because of the split in PPR
Fix errors in calculating best delegations

One was a typo in the formula I was given, the other was me being dumb