Lay groundwork for ballot check-ins
Merge branch 'master' into ballot-checkin
Minor cosmetic changes
Add reply standings page, closes #6
Minor cosmetic
Change the 'conflict' colour to yellow-orange
Fix #9, or at least I think this works okay
Revert "Widen unused adjudicators column in "edit adjudicators" screen"

This reverts commit 9d7065adb89567add68d47ac1743d007daf9a659.
Add institution abbreviations (shorter than code, used in edit adjudicators screen)
Add institution conflicts (so individual team conflict don't have to be entered)
Fix conflict highlighting bug
Change edit adjudicator conflict CSS classes
Add data/vic2012/change_adjudicator_conflicts.py
Merge branch 'model-adds' into ballot-checkin
raise RuntimeError not NoneType
Correct rank numbers so that it displays equal ranks correctly
Merge branch 'model-adds' into ballot-checkin
Minor cosmetic changes
Don't allow draws
Upgrade Django to 1.6.1