Merge pull request #781 from Sulcata/master

Include the team showcase in tour signups as well
fix ugly spaghetti code and extend functionality of limiting megas