Merge branch 'master' of github.com:dellsystem/mcmun-2014
Merge branch 'master' of github.com:dellsystem/mcmun-2014
Merge branch 'master' of github.com:dellsystem/mcmun-2014
Merge branch 'master' of github.com:dellsystem/mcmun-2014
Merge branch 'master' of github.com:dellsystem/mcmun-2014
Merge branch 'master' of github.com:dellsystem/mcmun-2014
Merge branch 'master' of github.com:dellsystem/mcmun-2014
Merge branch 'master' of github.com:dellsystem/mcmun-2014
Merge branch 'master' of github.com:dellsystem/mcmun-2014
Merge branch 'master' of github.com:dellsystem/mcmun-2014
Update fee calculator to use new payment scheme

No taxes, and priority registration delegate fee is now $85 instead of
$80.

Kind of late, oops
Show num delegates for RegisteredSchools in admin
Merge branch 'master' of github.com:dellsystem/mcmun-2014