Add campfire dependency
Initial work at campfire adaptor
Make campfire available to riemann
Merge pull request #2 from aphyr/master

Update Dsci master
Formatting
Bump to riemann-clojure-client 0.2.2-snapshot
riemann-clojure-client 0.2.2
Ignore lein-repl-history
Merge branch 'master' of github.com:aphyr/riemann
Add riemann.instrumentation, for measuring internal performance
Track rates and latencies for a core.

This *requires* that the config include an explicit instrumentation
service. I'll fix this in the next commit.
Service: add a conflict? function.

Two services can conflict with one another. Now we can detect that.
Restructure core to support instrumentation service.

Cores now have a conj-service function to add services. Conj-service
checks for conflicts, preventing you from adding multiple incompatible
services to the same core. This allows (config/instrumentation) to
*replace* any existing instrumentation service, while simultaneously
supporting preserved services across core reloads.

Cores now come with a default instrumentation service.

Also updates and improves several tests for riemann.config.

Also introduces faster restarts of thread-services by interrupting the
thread, which makes long-polling thread-services feasible.
riemann.config: no longer needs gen-class
Remove dependency on incanter-charts, bump to 1.4.1
No longer need to AOT-compile anything in riemann
Log PID without hostname.
Reaper: reload service correctly when :keep-keys changes.

Fixes #173
riemann.email: switch formatting functions over to riemann.common
scale wraps a common smap idiom