Change back to correct egg names, use -e and notes on removing later.
Merge branch 'master' into staging-auto-deployed