Merge pull request #2252 from metabase/stop-the-insanity

src/metabase/api/metric.clj

src/metabase/db/migrations.clj

src/metabase/models/metric.clj

test/metabase/api/activity_test.clj

test/metabase/api/card_test.clj

test/metabase/api/dashboard_test.clj

test/metabase/api/dataset_test.clj

test/metabase/api/field_test.clj

test/metabase/api/metric_test.clj

test/metabase/api/revision_test.clj

test/metabase/api/segment_test.clj

test/metabase/driver/query_processor/macros_test.clj

test/metabase/driver/sync_test.clj

test/metabase/events/activity_feed_test.clj

test/metabase/events/dependencies_test.clj

test/metabase/events/last_login_test.clj

test/metabase/events/revision_test.clj

test/metabase/events/view_log_test.clj

test/metabase/models/dashboard_card_test.clj

test/metabase/models/dashboard_test.clj