Support for config merging from specified directory
Prevent userscript from dying when seeing an invalid line from a script.
Per #263, document alternative, faster interface collector
Make sure to kill old diamond process even if killproc fails. Otherwise
we end up with multiple diamond processes reporting.
Add a new hostname_method=shell.

The 'shell' hostname method will run the string set in the 'hostname'
key through the default shell and use its stdout as the hostname.
Merge pull request #680 from kjkuan/shell_hostname_method

Add a new hostname_method=shell.
Merge pull request #687 from kloeri/master

Make sure to kill old diamond process even if killproc fails.
Merge pull request #658 from XTAIN/config-dir

Support for config merging from specified directory
Merge pull request #689 from gitarzysta/master

Prevent userscript from dying when seeing an invalid line from a script.
Merge branch 'master' of github.com:BrightcoveOS/Diamond
Fix doc example
Set elbs_ignored to default as false