overriding gitattributes (to be overridden again by merge)
Merge branch 'develop' of https://github.com/Spantree/elasticsearch-talk into develop

Conflicts:
	.gitattributes