cleanup -- remove scribe references
rename getType to getDataType
rename getValue to getMetricValue
break DataType out into separate file as per TODO
add an equals method to metric
Merge pull request #276 from fourk/kafka_ingest_prep

Kafka Ingest prep-work -- Renamings and refactorings
Change the Rollup Cloud Files export format
fix bug where we return 200 even when there is an exception persisting

Conflicts:

	blueflood-http/src/main/java/com/rackspacecloud/blueflood/inputs/handlers/HttpMetricsIngestionServer.java
Prepend with date again
Add unique identifier for Cloud Files host
Merge pull request #278 from chinmay-gupte/chinmay/fix_cloudfiles_export_filename

Change the Cloud Files rollup exporter file name format
upgrade elasticsearch to 1.1.0
Merge pull request #279 from fourk/fix_http_ingestion_error_reporting

fix bug where we return 200 even when there is an exception persisting during http ingest
Merge pull request #281 from dlobue/elasticsearch_1.1.0

upgrade elasticsearch to 1.1.0
Initial commit for adding a killover switch for dedicated rollups
Add the metrics dropping functionality at rollup layer
Fix some nits
Remove redundant import