Send events to Logstash, even if they don't have metrics
Merge pull request #426 from blalor/logstash_all_the_things

Send events to Logstash, even if they don't have metrics
Add support for the `test` command to the startup scripts
Merge pull request #428 from dbriones/startup-script-doesnt-accept-test-command

Add support for the `test` command to the startup scripts
Add support for passing a map to sorted-sample

When the points provided to sorted-sample (and by extension percentiles)
is a map, the values of that map will be appended to the service name
instead of the point value.

* Other whitespace cleanup in the folds tests.
Merge pull request #430 from SegFaultAX/feature-sorted-sample-maps

Add support for passing a map to sorted-sample
Fix: Cannot import shinken adapter in config

I believe this is why I couldn't import the shinken adapter in my config...
Merge pull request #431 from ReAzem/patch-1

Fix: Cannot use shinken adapter in config
Support external log4j configuration

Support external log4j configuration. If the property
log4j.configuration is set, do not run `riemann.logging/init`.
`riemann.logging/init` prevents the use of external configuration files
because it removes all configured appenders.

So long as `riemann.logging/init`, it is possible to configure log4j
using a log4j.properties
Merge pull request #434 from dlobue/support_external_logging_config

Support external log4j configuration
Merge branch 'master' into feature/depend

Conflicts:
	src/riemann/config.clj