Updates Graphite Cluster

Pulls graphite 1 adds graphite 2 back into mix.
Merge branch 'master' into graphite2
Updates Cluster Config

Adds graphite2 pulls graphite 1
Updates carbon cache conf