Having issues with git/github, so just in case, I'm posting the patches here.
Current implementation, bugs notwithstanding, is the following
You can select 'None' as a tera type in the teambuilder when in a natdex format.
In battle
You cannot tera/dynamax if you have the option to mega...