Remove deprecated clojure.contrib and replace used lib with clojure.tools.
Add note about branches to readme.
Fix counts to be keywords to work with new yaml library.
Support setting configuration options on the command line
  - Merge yaml configs instead of choosing just one.
  - Apply cli hashmap options to clusters and storm configs.
  - Update docs with info on command line configs.
Clean up conf to contain some nice example confs rather than ours.
Merge branch 'development'