Improved state file

[deuscapturus]

Changes are necessary for successful graphite installation. Some changes are just improved methods for performing states.

[whiteinge]

Thanks!