Cleaning up .gitignore
Step 2: cleaning up .gitignore
Step 3: clean up .gitignore - this should be the final step
Step 4: merge .gitignore from Mark's changes