Adding mapping and analysis
Merge branch 'develop' of github.com:Spantree/elasticsearch-talk into develop

Conflicts:
	presentation/index.html