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
Add McGill email help text to staff application

because people r dum
Merge branch 'master' of github.com:dellsystem/mcmun-2014
Fix merge conflict due to force push
Add fabfile command for stats