Upgrade and post-prep

Lingering issues on the dev box with .NET4.0 and known issues continuing
to redirect. Working after NET40.config rename. Back to module dev.