Don't destroy the build folder, only its contents
added egg cache to .gitignore
resolving merge conflicts