diff --git a/_docs/local_development_setup.md b/_docs/local_development_setup.md
index 327282395b..c895cdf462 100644
--- a/_docs/local_development_setup.md
+++ b/_docs/local_development_setup.md
@@ -27,8 +27,18 @@ Diesel is an ORM, which is dumb, so we use sqlx as at-compile-time typesafe SQL.
 
 ```
 sudo apt-get install libmysqlclient-dev
-cargo install sqlx-cli --no-default-features --features mysql
-cargo install diesel_cli --no-default-features --features mysql
+cargo install sqlx-cli --no-default-features --features mysql [2022-01-16: is this needed?]
+```
+
+To install a more modern version of Diesel (unreleased) that 
+supports the "migrations_dir" toml config option:
+
+```
+cargo install diesel_cli \
+  --git https://github.com/diesel-rs/diesel.git \
+  --rev a213fe232a122f35a812b0ce0269708a1845a4c9 \
+  --no-default-features \
+  --features mysql
 ```
 
 #### Linux database notes
diff --git a/migrations/.gitkeep b/_migrations/.gitkeep
similarity index 100%
rename from migrations/.gitkeep
rename to _migrations/.gitkeep
diff --git a/migrations/2021-05-15-071534_users/down.sql b/_migrations/2021-05-15-071534_users/down.sql
similarity index 100%
rename from migrations/2021-05-15-071534_users/down.sql
rename to _migrations/2021-05-15-071534_users/down.sql
diff --git a/migrations/2021-05-15-071534_users/up.sql b/_migrations/2021-05-15-071534_users/up.sql
similarity index 100%
rename from migrations/2021-05-15-071534_users/up.sql
rename to _migrations/2021-05-15-071534_users/up.sql
diff --git a/migrations/2021-05-15-071545_asset_upload_jobs/down.sql b/_migrations/2021-05-15-071545_asset_upload_jobs/down.sql
similarity index 100%
rename from migrations/2021-05-15-071545_asset_upload_jobs/down.sql
rename to _migrations/2021-05-15-071545_asset_upload_jobs/down.sql
diff --git a/migrations/2021-05-15-071545_asset_upload_jobs/up.sql b/_migrations/2021-05-15-071545_asset_upload_jobs/up.sql
similarity index 100%
rename from migrations/2021-05-15-071545_asset_upload_jobs/up.sql
rename to _migrations/2021-05-15-071545_asset_upload_jobs/up.sql
diff --git a/migrations/2021-05-15-071601_assets/down.sql b/_migrations/2021-05-15-071601_assets/down.sql
similarity index 100%
rename from migrations/2021-05-15-071601_assets/down.sql
rename to _migrations/2021-05-15-071601_assets/down.sql
diff --git a/migrations/2021-05-15-071601_assets/up.sql b/_migrations/2021-05-15-071601_assets/up.sql
similarity index 100%
rename from migrations/2021-05-15-071601_assets/up.sql
rename to _migrations/2021-05-15-071601_assets/up.sql
diff --git a/migrations/2021-05-15-212913_inference_jobs/down.sql b/_migrations/2021-05-15-212913_inference_jobs/down.sql
similarity index 100%
rename from migrations/2021-05-15-212913_inference_jobs/down.sql
rename to _migrations/2021-05-15-212913_inference_jobs/down.sql
diff --git a/migrations/2021-05-15-212913_inference_jobs/up.sql b/_migrations/2021-05-15-212913_inference_jobs/up.sql
similarity index 100%
rename from migrations/2021-05-15-212913_inference_jobs/up.sql
rename to _migrations/2021-05-15-212913_inference_jobs/up.sql
diff --git a/migrations/2021-05-15-212918_inference_results/down.sql b/_migrations/2021-05-15-212918_inference_results/down.sql
similarity index 100%
rename from migrations/2021-05-15-212918_inference_results/down.sql
rename to _migrations/2021-05-15-212918_inference_results/down.sql
diff --git a/migrations/2021-05-15-212918_inference_results/up.sql b/_migrations/2021-05-15-212918_inference_results/up.sql
similarity index 100%
rename from migrations/2021-05-15-212918_inference_results/up.sql
rename to _migrations/2021-05-15-212918_inference_results/up.sql
diff --git a/migrations/2021-05-15-212920_badges/down.sql b/_migrations/2021-05-15-212920_badges/down.sql
similarity index 100%
rename from migrations/2021-05-15-212920_badges/down.sql
rename to _migrations/2021-05-15-212920_badges/down.sql
diff --git a/migrations/2021-05-15-212920_badges/up.sql b/_migrations/2021-05-15-212920_badges/up.sql
similarity index 100%
rename from migrations/2021-05-15-212920_badges/up.sql
rename to _migrations/2021-05-15-212920_badges/up.sql
diff --git a/migrations/2021-05-30-010200_firehose/down.sql b/_migrations/2021-05-30-010200_firehose/down.sql
similarity index 100%
rename from migrations/2021-05-30-010200_firehose/down.sql
rename to _migrations/2021-05-30-010200_firehose/down.sql
diff --git a/migrations/2021-05-30-010200_firehose/up.sql b/_migrations/2021-05-30-010200_firehose/up.sql
similarity index 100%
rename from migrations/2021-05-30-010200_firehose/up.sql
rename to _migrations/2021-05-30-010200_firehose/up.sql
diff --git a/migrations/2021-06-09-010200_ip_bans/down.sql b/_migrations/2021-06-09-010200_ip_bans/down.sql
similarity index 100%
rename from migrations/2021-06-09-010200_ip_bans/down.sql
rename to _migrations/2021-06-09-010200_ip_bans/down.sql
diff --git a/migrations/2021-06-09-010200_ip_bans/up.sql b/_migrations/2021-06-09-010200_ip_bans/up.sql
similarity index 100%
rename from migrations/2021-06-09-010200_ip_bans/up.sql
rename to _migrations/2021-06-09-010200_ip_bans/up.sql
diff --git a/migrations/2021-06-09-010300_mod_audit_log/down.sql b/_migrations/2021-06-09-010300_mod_audit_log/down.sql
similarity index 100%
rename from migrations/2021-06-09-010300_mod_audit_log/down.sql
rename to _migrations/2021-06-09-010300_mod_audit_log/down.sql
diff --git a/migrations/2021-06-09-010300_mod_audit_log/up.sql b/_migrations/2021-06-09-010300_mod_audit_log/up.sql
similarity index 100%
rename from migrations/2021-06-09-010300_mod_audit_log/up.sql
rename to _migrations/2021-06-09-010300_mod_audit_log/up.sql
diff --git a/migrations/2021-06-13-010101_synthetic_ids/down.sql b/_migrations/2021-06-13-010101_synthetic_ids/down.sql
similarity index 100%
rename from migrations/2021-06-13-010101_synthetic_ids/down.sql
rename to _migrations/2021-06-13-010101_synthetic_ids/down.sql
diff --git a/migrations/2021-06-13-010101_synthetic_ids/up.sql b/_migrations/2021-06-13-010101_synthetic_ids/up.sql
similarity index 100%
rename from migrations/2021-06-13-010101_synthetic_ids/up.sql
rename to _migrations/2021-06-13-010101_synthetic_ids/up.sql
diff --git a/migrations/2021-08-25-010101_alter_tables_add_vocoder_type/down.sql b/_migrations/2021-08-25-010101_alter_tables_add_vocoder_type/down.sql
similarity index 100%
rename from migrations/2021-08-25-010101_alter_tables_add_vocoder_type/down.sql
rename to _migrations/2021-08-25-010101_alter_tables_add_vocoder_type/down.sql
diff --git a/migrations/2021-08-25-010101_alter_tables_add_vocoder_type/up.sql b/_migrations/2021-08-25-010101_alter_tables_add_vocoder_type/up.sql
similarity index 100%
rename from migrations/2021-08-25-010101_alter_tables_add_vocoder_type/up.sql
rename to _migrations/2021-08-25-010101_alter_tables_add_vocoder_type/up.sql
diff --git a/migrations/2021-09-10-053520_alter_tables_add_talknet_model_type/down.sql b/_migrations/2021-09-10-053520_alter_tables_add_talknet_model_type/down.sql
similarity index 100%
rename from migrations/2021-09-10-053520_alter_tables_add_talknet_model_type/down.sql
rename to _migrations/2021-09-10-053520_alter_tables_add_talknet_model_type/down.sql
diff --git a/migrations/2021-09-10-053520_alter_tables_add_talknet_model_type/up.sql b/_migrations/2021-09-10-053520_alter_tables_add_talknet_model_type/up.sql
similarity index 100%
rename from migrations/2021-09-10-053520_alter_tables_add_talknet_model_type/up.sql
rename to _migrations/2021-09-10-053520_alter_tables_add_talknet_model_type/up.sql
diff --git a/migrations/2021-09-10-074547_alter_tables_talknet_metadata/down.sql b/_migrations/2021-09-10-074547_alter_tables_talknet_metadata/down.sql
similarity index 100%
rename from migrations/2021-09-10-074547_alter_tables_talknet_metadata/down.sql
rename to _migrations/2021-09-10-074547_alter_tables_talknet_metadata/down.sql
diff --git a/migrations/2021-09-10-074547_alter_tables_talknet_metadata/up.sql b/_migrations/2021-09-10-074547_alter_tables_talknet_metadata/up.sql
similarity index 100%
rename from migrations/2021-09-10-074547_alter_tables_talknet_metadata/up.sql
rename to _migrations/2021-09-10-074547_alter_tables_talknet_metadata/up.sql
diff --git a/migrations/2021-12-20-230000_model_categories/down.sql b/_migrations/2021-12-20-230000_model_categories/down.sql
similarity index 100%
rename from migrations/2021-12-20-230000_model_categories/down.sql
rename to _migrations/2021-12-20-230000_model_categories/down.sql
diff --git a/migrations/2021-12-20-230000_model_categories/up.sql b/_migrations/2021-12-20-230000_model_categories/up.sql
similarity index 100%
rename from migrations/2021-12-20-230000_model_categories/up.sql
rename to _migrations/2021-12-20-230000_model_categories/up.sql
diff --git a/migrations/2022-01-11-042235_twitch_oauth_tokens/down.sql b/_migrations/2022-01-11-042235_twitch_oauth_tokens/down.sql
similarity index 100%
rename from migrations/2022-01-11-042235_twitch_oauth_tokens/down.sql
rename to _migrations/2022-01-11-042235_twitch_oauth_tokens/down.sql
diff --git a/migrations/2022-01-11-042235_twitch_oauth_tokens/up.sql b/_migrations/2022-01-11-042235_twitch_oauth_tokens/up.sql
similarity index 100%
rename from migrations/2022-01-11-042235_twitch_oauth_tokens/up.sql
rename to _migrations/2022-01-11-042235_twitch_oauth_tokens/up.sql
diff --git a/migrations_squashed/tts_tables/tts_inference_jobs.sql b/_migrations_squashed/tts_tables/tts_inference_jobs.sql
similarity index 100%
rename from migrations_squashed/tts_tables/tts_inference_jobs.sql
rename to _migrations_squashed/tts_tables/tts_inference_jobs.sql
diff --git a/migrations_squashed/tts_tables/tts_model_upload_jobs.sql b/_migrations_squashed/tts_tables/tts_model_upload_jobs.sql
similarity index 100%
rename from migrations_squashed/tts_tables/tts_model_upload_jobs.sql
rename to _migrations_squashed/tts_tables/tts_model_upload_jobs.sql
diff --git a/migrations_squashed/tts_tables/tts_models.sql b/_migrations_squashed/tts_tables/tts_models.sql
similarity index 100%
rename from migrations_squashed/tts_tables/tts_models.sql
rename to _migrations_squashed/tts_tables/tts_models.sql
diff --git a/migrations_squashed/tts_tables/tts_results.sql b/_migrations_squashed/tts_tables/tts_results.sql
similarity index 100%
rename from migrations_squashed/tts_tables/tts_results.sql
rename to _migrations_squashed/tts_tables/tts_results.sql
diff --git a/crates/service/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs b/crates/service/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs
index 145c252eb4..159e2d4f98 100644
--- a/crates/service/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs
+++ b/crates/service/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs
@@ -115,7 +115,6 @@ struct ObsGatewayWebSocket {
   twitch_thread: Arc<ObsTwitchThread>,
 }
 
-
 impl ObsGatewayWebSocket {
   fn new(
     twitch_user_id: u32,
diff --git a/diesel.toml b/diesel.toml
index 0588bd6b16..4e9295fe7c 100644
--- a/diesel.toml
+++ b/diesel.toml
@@ -3,3 +3,11 @@
 
 [print_schema]
 file = "_ignored_schema.rs"
+
+# I want to sort this directory first for easier reference
+# Not released yet, but added here:
+# https://github.com/diesel-rs/diesel/pull/2179
+# You'll need to install the a non-released diesel CLI
+# (See storyteller READMEs/docs on how to install)
+[migrations_directory]
+dir = "_migrations"