Marking jars as binary
Merge branch 'develop' of github.com:Spantree/elasticsearch-talk into develop

Conflicts:
	.gitattributes