touch up email doc
put the pencil to graphite
minor updates, submitting two PRs as one
correct email config hash options
Update README with new travis URL
Tarball packages. Homogenized init. Common defaults.
add recommended options to fpm for centos, which should negate the need to set executable
geoip touchup
Merge pull request #1103 from fayep/pkgbuilding

Add tarball based packages. Fix environment passing in bin/logstash.
Merge remote-tracking branch 'upstream/master'
Merge pull request #1107 from ciarand/patch-1

Update README with new travis URL
- Remove link to Travis since we haven't used that in ages
- Use 'Logstash' capitalization
Merge pull request #1119 from jordansissel/readme-fixes

- Remove link to Travis since we haven't used that in ages
Merge remote-tracking branch 'upstream/master'
Use __FILE__-relative path for the default template.

Users reported this (or similar) error:
Errno::ENOENT: No such file or directory -
lib/logstash/outputs/elasticsearch/elasticsearch-template.json

This is because the file being searched-for was relative to $PWD, not
relative to the elasticsearch output plugin file itself.

Tested works like this:

    % logstash/bin/logstash -e 'output { elasticsearch {  embedded => true } }'

Prior to this patch, the above command line would fail with this error:

    Errno::ENOENT: No such file or directory - lib/logstash/outputs/elasticsearch/elasticsearch-template.json
    ...
        get_template at /home/jls/projects/logstash/lib/logstash/outputs/elasticsearch.rb:285
Update ES and jruby

Updating ES to 1.0.1
Updating Jruby to 1.7.11
Merge pull request #1121 from electrical/update_es_jruby

Update ES and jruby
Merge pull request #1120 from jordansissel/relative-path-template-fix

Use __FILE__-relative path for the default template.
Merging funct filter in fingerprint filter
Merge pull request #1122 from electrical/punct_to_fingerprint

Merging funct filter in fingerprint filter