add .gitattributes, to merge=ours for .gitignore - ala http://git-scm.com/book/en/Customizing-Git-Git-Attributes#Merge-Strategies
  - so .gitignore is set to the branch version, rather than merged
  - ALSO must define a dummy ours merge strategy with:
    `git config --global merge.ours.driver true`