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
Merge remote-tracking branch 'racker/master' into kafka_ingestion3

Conflicts:
	blueflood-http/src/main/java/com/rackspacecloud/blueflood/inputs/handlers/HttpMetricsIngestionServer.java