Modified gitignore, cleanup