Ignore RubyMine/IntelliJ dirs
consolidate java grok patterns
Merge branch 'pr/1518'
Merge git://github.com/logstash/logstash