Fixed invalid JSON formatting.
Fixed broken MachineMetricsTests - MachineMetrics needs to be provided with the Metrics instance to be included in All collection.
Merge pull request #37 from alexmg/master

Fixed invalid JSON formatting and broken unit test