Reduced data download size by merging

See https://github.com/substantial/choosy/issues/9. This breaks
compatibility, so jumped from 0.5.x to 0.6.0