Repo cleanup

- Quick repo cleanup branch to test PRs (Per Andrew)
- Updated gitignore for standard Xcode exclusions
- .gitattributes file with union merge strategy with
  Xcode project files marked as binary so we don't
  get conflicts when merging branches where there
  are file additions in both branches.
- Remove errant .DS_store file.