touch up email doc
put the pencil to graphite
minor updates, submitting two PRs as one
correct email config hash options
geoip touchup
clean trailing whitespace.
Merge pull request #1128 from miah/whitespace

clean trailing whitespace in elasticsearch output modules.
For you Graylog2 fans out there
Repeat after me: Logstash is a proper noun.
gelfin
additional fields, underscores
escape underscores
elasticsearch input
No longer making the flatjar.
Clean up old jar building code...
Merge pull request #1132 from untergeek/untergeek-pkgbuild

Clean up old jar stuff
Update gemfile locks for various rubies.

Notable changes for JRuby:
* atomic 1.1.14-java -> 1.1.15-java
* aws-sdk 1.29.0 -> 1.35.0
* backports 3.3.5 -> 3.6.0
* bindata 1.6.0 -> 2.0.0
* cinch 2.0.10 -> 2.1.0
* docile 1.1.1 -> 1.1.3
* faraday 0.8.8 -> 0.9.0
* geoip 1.3.3 -> 1.3.5
* metaclass 0.0.1 -> 0.0.4
* metriks 0.9.9.5 -> 0.9.9.6
* minitest 5.0.8 -> 5.3.0
* msgpack-jruby 1.3.2-java -> 1.4.0-java
* multi_json 1.8.2 -> 1.8.4
* multipart-post 1.2.0 -> 2.0.0
* murmurhash3 0.1.3 -> 0.1.4
* nokogiri 1.6.0-java -> 1.6.1-java
* polyglot 0.3.3 -> 0.3.4
* redis 3.0.6 -> 3.0.7
* thread_safe 0.1.3-java -> 0.2.0-java
* user_agent_parser 2.1.1 -> 2.1.2
* xml-simple 1.1.2 -> 1.1.3
Merge pull request #1133 from jordansissel/LOGSTASH-1898

Update gemfile locks for various rubies.
Add 'env' command

This aims to let developers run arbitrary commands with the logstash
environment setup (env vars for RUBYLIB, GEM_HOME, etc)
Merge pull request #1134 from jordansissel/add-env-command

Add 'env' command