Attack of the megadiff
Yet another hack night
More polish
Indented things properly
Enable permissions
Nitfixes
Fixed spaces and equals
Merge pull request #253 from CJS7070/master

Added new mailing lists
More nit fixes
Try 2
welcome email: add line about resume book
Temp delete of photos so I can grep
Merge pull request #254 from colegleason/welcome-email-resume

welcome email: add line about resume book -- I'll pull this into prod tmr.
More cleanup
Add relevant migrations back in
Merge pull request #252 from ace-n/caffeine

Add caffeine frontend
Update requirements.txt

Add enum34
Improve caffeine manager navigation
Nits
Nits 2