Merge pull request #478 from metabase/annotation_2_0

src/metabase/driver/generic_sql/query_processor.clj

src/metabase/driver/generic_sql/query_processor/annotate.clj

src/metabase/driver/mongo/query_processor.clj

src/metabase/driver/query_processor.clj

src/metabase/util.clj

test/metabase/api/meta/dataset_test.clj

...base/driver/generic_sql/query_processor/annotate_test.clj

test/metabase/driver/generic_sql/query_processor_test.clj

test/metabase/driver/query_processor_test.clj

test/metabase/test/data.clj

test/metabase/test_setup.clj