Intergrated rejected .gitignore pull request with Lee's contributions.