v2.2.1 Upgrade

Upgrade Nerdery fork to v2.2.1