removing useless notice
Merge branch 'develop' of https://github.com/Spantree/elasticsearch-talk into develop

Conflicts:
	puppet/modules/elasticsearch_talk/manifests/index.pp
Creating index and part of document mapping section
Merge branch 'develop' of github.com:Spantree/elasticsearch-talk into develop
ignoring some mindjet transient artifacts
edit to the mapping description
Adding mapping and analysis
Merge branch 'develop' of github.com:Spantree/elasticsearch-talk into develop

Conflicts:
	presentation/index.html
Fixed merge error