More gitignore changes, cleanup of old files