Prepping for merging current dev.

Will need to change the down revision, and fix the migration

migrations/versions/65b5ed6ae05b_remove_slashes_from_name_values.py

@@ -12,6 +12,7 @@ import sqlalchemy as sa
 # revision identifiers, used by Alembic.
 revision = '65b5ed6ae05b'
 down_revision = '44dd9397c555'
+# down_revision = '1fb36d682c7f'
 branch_labels = None
 depends_on = None
 
@@ -24,6 +25,6 @@ def upgrade():
 
 def downgrade():
     # There are already valid uses of '-' in these tables.
-    # We probably don't want to change them to '/'
+    # We probably don't want to change all of them to '/'
     # So, we pass here. No downgrade.
     pass

migrations/versions/7225d990740e_move_files_to_filesystem.py

@@ -48,7 +48,8 @@ def upgrade():
     # TODO:
     #  delete processed files from file_data table
     #  delete workflow_spec_dependency_file table
-    #  delete file_data_model_id from lookup_file table
+    #  delete file_data_model_id from lookup_file table  <-- This is wrong! We should change to file_id,
+    #  see migration 4980cb3dea77
     for file_id in processed_files:
         processed_models = session.query(FileDataModel).filter(FileDataModel.file_model_id==file_id).all()
         for processed_model in processed_models: