NO STAGING! tweaks to match changes made in sandbox
Merge pull request #1269 from pennij/working_thurs0502

NO STAGING! tweaks to match changes made in sandbox