Update ES metric document mapping

Update ES metric document mapping to match the layout we discussed
during metrics week:
- Use 'human' names - no all-upper case names.
- Ditch type - it is going away, and is only a single letter.
Add backwards compatible v1.0 uris back to master
Use correct paths for uris
Merge pull request #347 from dlobue/update_es_mapping

Update ES metric document mapping
Fixes bug: Ensure search results are put into json and not dropped.
Merge pull request #352 from gdusbabek/empty_search_results

Ensure search results are put into JSON and not dropped.
Merge pull request #349 from chinmay-gupte/chinmay/add_backwards_compatible_uris_blueflood_master

NOT FOR MASTER: Add backwards compatible v1.0 endpoints
Merge pull request #346 from tilogaat/master

Adding timer instrumentation for BatchSplitter and RollupTypeCacher
Merge pull request #353 from tilogaat/master

Adding finer granularity of timers to HttpMetricsIngestionHandler
Merge branch 'master' of github.com:rackerlabs/blueflood into addTtlBins
forcing ttls during ingestion to be constant
Merge pull request #6 from tilogaat/addTtlBins

Making ttls constant based on a config value