hotfix: duplicate MOON_BOUNCE

Now, how often do you get to write that in a commit?

Looks like I got too excited about the moon bounce and added it twice.
Merge pull request #273 from EliAndrewC/magstock_email_review

Changes needed for magstock prereg launch
fix swag attribute for magstock
- shows the shirt name and color nicely
Merge branch 'ftr_swag_name_correct' into develop