Merge branch 'ES1.0'

* ES1.0:
  Added ES version 1.0.0 and Kibana 3 milestone 5 to the Makefile.
  LOGSTASH-1885 - Adding dns resolution to lumberjack output
  LOGSTASH-1680 - Adding codec support while fixing bug in lumberjack output
Merge branch 'master' of https://github.com/logstash/logstash
Update template to fit ES 1.0 API changes

http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/_multi_fields.html

> Multi-fields are dead! Long live multi-fields! Well, the field type multi_field has been removed. Instead, any of the core field types (excluding object and nested) now accept a fields parameter.
The analyzer section is no longer needed as the defaults cover this now:

http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/_stopwords.html

> Previously, the standard and pattern analyzers used the list of English stopwords by default, which caused some hard to debug indexing issues. Now they are set to use the empty stopwords list (ie _none_) instead.
Merge branch 'master' of https://github.com/logstash/logstash
Added contrib plugin link on doc page.
Merge pull request #1093 from untergeek/docfix-untergeek

Docfix untergeek