fix merging problem with linear shard specs
Merge branch 'master' of github.com:metamx/druid