Clean pyc files during update, and enable merging during migration.

Going to directly merge this fix for now, but please take a look when you have a chance, @bcipolli. Thanks!