added more intermediate files to .gitignore, fixed broken commits