more pythonic way of doing this
Merge pull request #267 from EliAndrewC/bug_email_regex

more robust email regex
capitolize shirts, add moon bounce.
Changes needed for magstock prereg launch

Made the most important changes for pre-reg launch. May or may not need
more changes later.
Merge pull request #263 from EliAndrewC/ftr_magstock_shirt_stuff

Shirt color+type support
Merge branch 'master' into develop
Merge remote-tracking branch 'origin/magstock_email_review' into develop