Put metadata back in (not totally functional: it always uses first datasets metadata)
Merge branch 'api-breaks' into fix-metadata
Add HACKHACK warning
Merge pull request #1160 from palantir/fix-metadata

Put metadata back in