etcdserver: refactor cluster and clusterStore

Integrate clusterStore into cluster, and let cluster become the source of
cluster info.

fixes #1354 

early feedback welcome
I'm wondering if we can just get away without this function and use the same constructor (e.g. `NewClusterFromString` or something similar) for both the discovery and non-discovery cases in `setupCluster`.