Clean up yo shizzle when you uninstizzle or delizzle
Clean up email templates as well
Merge branch 'refs/heads/2.3/develop' into 3.0/develop