Added Elasticsearch mapping template management with official default template.
Mirrors the changes in elasticsearch_http.rb in #826 with specific changes for this output plugin.
Merge branch 'master' of https://github.com/logstash/logstash

# By Brad Fritz (7) and others
# Via Jordan Sissel (13) and others
* 'master' of https://github.com/logstash/logstash: (35 commits)
  [rabbitmq] Bunny 1.0.5+
  Fix markdown syntax (LOGSTASH-1684)
  regen
  Add racc gem for rbx (since it doesn't ship with it)
  Fix markdown syntax (LOGSTASH-1684)
  Force the default string encoding to be UTF-8.
  - Add 'protocol' setting to allow users to use the 'Transport' client in elasticsearch. (LOGSTASH-102) - Add 'bind_port' setting to allow users with the default node protocol to choose what local port is used. (LOGSTASH-1453)
  [rabbitmq] Switch to March Hare 2.0
  Raise configuration error when invalid rates are set
  Flush only selected rates for meter metrics
  Split rate and percentiles spec tests
  Better spec context names
  Make metric filter's rate and percentiles configurable
  replace commet, because it copy from split filter,;-)
  add punct filter
  [packaging] adapt previous patchset to new .VERSION.mk
  [packaging] depend on default-jre-headless
  [packaging] install only one copy of logrotate.conf
  [packaging] minor RPM improvements
  [packaging] flag files in /etc as configfiles
  ...

Conflicts:
	lib/logstash/outputs/elasticsearch.rb
Merging additions for node protocol.
Pruned missed merge messages (how’s that for alliteration?)
Major updates for template management:
Java API methods for elasticsearch.rb
Cleaned up documentation for elasticsearch_http.rb
Updated Makefile to use Elasticsearch 0.90.7 (necessary for new template management Java API methods)
Updated logstash.gemspec to use updated jruby-elasticsearch (where the new template management framework is for JRuby)
Cleaned up grammar in documentation here.  Speak English better… :-/
Merge pull request #839 from untergeek/master

Added elasticsearch mapping template management to elasticsearch output plugin
- Move the elasticsearch index template to a separate directory like
  other helper things