Tweaks
Merge branch 'develop' of github.com:Spantree/elasticsearch-talk into develop