Merge setup.py changes from master
Merge postinstall from master
Performance Improvement.  Keep the length of the hash ring in a static var.
Performance Improvement.  If replication factor is 1, then use get_node since there's no reason to return the whole ring if we know the key is only in one node
Add instrumentation on ratelimit exceeded for writs and creates
Explicitly set the umask so that the mkdir gets the parents with the right permissions
Allow arguments profiler and savestats, which are passed to twisted
Feature.  Implement Aggregation Frequency Multiplier.  That is, to have the aggregation compute task happen at a multiplier of the frequency/interval
Make that a float by default so I can set a non-integer value
Add in documentation for AGGREGATION_FREQUENCY_MULTIPLIER
Move return sorted out of the lock

It may not matter, but in the case that the sort happens inside the
lock moving this out side of that. Add logging of the calculation
of the metric_queue_size

Conflicts:

	lib/carbon/cache.py
Fix MetricCache size counter after dedupe changes

Bug Fix: The deduplication changes erroneously always increased the
counter for the size of the MetricCache dictionary.  This checks if the
key exists and, if so, doesn't increase the size.
Modify log verbage
Replace whitelist processor with filter processor

The filter pipeline has a cleaner and more flexible
config style than the whitelist

From example config:
  filter - apply filer rules defined in filter-rules.conf to metric
  names. Rules are applied in order and action on match is taken
  immediately. Metrics which match an 'exclude' rule are dropped
  from futher pipeline processors. Metrics matching no rules will
  be accepted by default

Conflicts:

	lib/carbon/service.py
Modify aggregation filter behavior slightly

Make the behavior match filter processor
Allow the carbon-client to load in metrics from files in a directory.

The new datadir option will cause the carbon-client to run indefinitely
and look for files ending in .log to load parse/send to carbon.  File
format is the same as the stdin reader.
Make the default increment() case faster
Add instrumentation to each pipeline function.

Conflicts:

	lib/carbon/aggregator/processor.py
	lib/carbon/filter.py
	lib/carbon/rewrite.py
Move the interval elimination logic around

Move the interval elimination logic around in the compute aggregate
routines. Attempting to resolve computing an aggregate of a very
old interval (really late arrivals) and to not compute the
aggregate during the current interval.
Remove try block and float casting, since the datapoints are coming in pickled.