Wow! Cool .gitattributes do cool stuff.

* Diff driver: http://git-scm.com/docs/gitattributes#_generating_diff_text 
* Exclude if archive: http://git-scm.com/book/ch7-2.html#Exporting-Your-Repository & http://alexbilbie.com/2012/11/exclude-objects-with-gitattributes/
Merge remote branch 'upstream/master'