Merge branch 'master' into hackathon
Sanitized email for hackathon registration notifs.

It still needs some work to be somewhat presentable. Help me!
Merge branch 'hackathon'