Fix shard count limit

Fix shard count limit at another place,
Use partitioned as a flag
Merge pull request #504 from metamx/shard-count-limit-fix

Fix shard count limit