Clean pyc files during update, and enable merging during migration.
Merge pull request #711 from jamalex/clean_pyc_during_update

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