Improving the name of these columns to be consistent between tables.

Tiny fix.
Upgraded join_columns_with_blah to handle nans as a "default" bad value!