Fixed state name collision when running in highstate
Merge pull request #20 from bentwire/cassandra_highstate_fixes

Fixed state name collision when running in highstate