.DS_Store should ignore all .DS_Store files
Clean up and alphabetize gitignore
Merge branch 'clean-up-gitignore' into staging

* clean-up-gitignore:
  Clean up and alphabetize gitignore
  .DS_Store should ignore all .DS_Store files