Merge pull request #14 from GeorgeJahad/master

Merging George's changes
Fixed indentation.
fixed json metric name; removed hash_metric default; @format is no longer a config var, but is now determined by json/hash metric values.