Merge branch 'graphite_megacarbon' into ceres_support

Conflicts:
	carbon/MANIFEST.in
	carbon/bin/carbon-client.py
	carbon/bin/carbon-daemon.py
	carbon/conf/carbon-daemons/example/aggregation-rules.conf
	carbon/conf/carbon-daemons/example/relay-rules.conf
	carbon/lib/carbon/aggregator/buffers.py
	carbon/lib/carbon/amqp_listener.py
	carbon/lib/carbon/amqp_publisher.py
	carbon/lib/carbon/cache.py
	carbon/lib/carbon/client.py
	carbon/lib/carbon/conf.py
	carbon/lib/carbon/events.py
	carbon/lib/carbon/instrumentation.py
	carbon/lib/carbon/log.py
	carbon/lib/carbon/manhole.py
	carbon/lib/carbon/protocols.py
	carbon/lib/carbon/relayrules.py
	carbon/lib/carbon/rewrite.py
	carbon/lib/carbon/routers.py
	carbon/lib/carbon/service.py
	carbon/lib/carbon/state.py
	carbon/lib/carbon/storage.py
	carbon/lib/carbon/util.py
	carbon/lib/carbon/writer.py
	carbon/lib/twisted/plugins/carbon_daemon_plugin.py
	carbon/setup.py
	docs/config-carbon.rst
	docs/overview.rst
	docs/tools.rst
	setup.py
	webapp/content/js/composer_widgets.js
	webapp/content/js/dashboard.js
	webapp/graphite/dashboard/views.py
	webapp/graphite/local_settings.py.example
	webapp/graphite/metrics/views.py
	webapp/graphite/remote_storage.py
	webapp/graphite/render/functions.py
	webapp/graphite/render/glyph.py
	webapp/graphite/render/views.py
	webapp/graphite/settings.py
	webapp/graphite/storage.py
	whisper/whisper.py
Performance Improvement.  Keep the length of the hash ring in a static var.
Functionality.  Add perSecond function: Derivative adjusted for the series time interval
Log keyfunc and path on load
Correct log in query function to output the number of datapoints.

Add a few additional logging statements to know which cache the queries are being sent to and the error response if they error out.
Fix 500 errors when trying to use the completer view.
Fix failed imports.
Auto-reload the page when converting from tree view to completer view.
Remove compatibility hack for 0.9.7
Merge branch 'ceres_support'

Conflicts:
	setup.py
	webapp/graphite/settings.py
Fix typo on merge
Query carbon-cache with whisper reads as well
Fix removed /contexts endpoint
Fix calls to carbonlink query in WhisperReader.

Probably needs to be duplicated in the GzippedWhisperReader.
Expose Profile and MyGraphs to admin site
Fixed minor bug in checking for WHISPER_DIR
Merge pull request #7 from daniellawrence/master

Fixes LP BUG#1006912
prefer matching whisper files to directories with the same name
Update master
Merge pull request #8 from scobal/master

Add Seyren to tools page