Removed aggregate_metrics and mapping_file, updated conf.example
Merge pull request #7 from hpcloud-mon/feature/JAH-210_Clean-up-chef-config-for-agent

Removed aggregate_metrics and mapping_file, updated conf.example