Merge branch 'master' into kingman
minor update
Merge branch 'kingman' of github.com:knagra/farnsworth into kingman
Updated django requirements now that 1.7 is out
Update response.html
Update response.html
Update request.html
Ruby bugfix
Update config.js
Don't allow alumni to be added as workshifters
Fixed failing tests
e-mail announcements
Merge branch 'master' of github.com:knagra/farnsworth
bugfix
bugfix
Merge branch 'master' into kingman
Merge branch 'kingman' of github.com:knagra/farnsworth into kingman
bugfix
Merge branch 'master' into kingman
announcement email update