touch up email doc
put the pencil to graphite
minor updates, submitting two PRs as one
correct email config hash options
geoip touchup
For you Graylog2 fans out there
Repeat after me: Logstash is a proper noun.
gelfin
additional fields, underscores
escape underscores
elasticsearch input
alert: nagios
Merge pull request #1139 from untergeek/master

Prepare for version bump
Updated CHANGELOG
Merge pull request #1140 from untergeek/1.4.x

Updated CHANGELOG
Merge pull request #1135 from kurtado/doc/output/nagios

alert: nagios
Merge pull request #1131 from kurtado/doc/input/elasticsearch

elasticsearch input
Merge pull request #1129 from kurtado/doc/output/gelf

For you Graylog2 fans out there
Merge pull request #1130 from kurtado/doc/input/gelf

gelf input docs
Merge pull request #1115 from kurtado/doc/filter/geoip

geoip touchup