Update keyspace.py so not depending on shard order
Update keyspace.py to use Name field from shard
Merge branch 'master' of https://github.com/youtube/vitess