Remove net_wealth from PSID, update data folder, and code formatting in psid_data_setup.py

[MaxGhenis]

I messed up #15 after getting behind master and accidentally adding a big file, so trying again. This PR:

• Removes net_wealth, which isn't in .RData (see Add net_wealth to psid_data_setup.py #21)
• Fixes the path to .RData
• Improves code formatting with black

The only substantive changes are in line 25 and 148; everything else is code formatting (sorry these aren't in separate commits).

[MaxGhenis]

I also verified that the script runs. It produced the following files in ogusa_calibrate:

first_stage_reg_results.pkl
hh_id_two_statuses.csv
psid_lifetime_income.pkl
psid_to_check.csv

I added ogusa_calibration/*.pkl and ogusa_calibration/*.csv to the .gitignore, though we probably want to move these files elsewhere, and/or potentially include them. Only psid_lifetime_income.pkl exceeds GitHub's 100MB limit (130MB), and some other file compression types might get that below the limit.

[MaxGhenis]

@jdebacker please let me know if you'd like more info on this to decide on merging.

[jdebacker]

Are the double quotes everywhere a black thing @MaxGhenis? You're killing me with these :-)

[MaxGhenis]

Yep will definitely make these separate commits in the future!

[jdebacker]

@MaxGhenis This is looking good to me. I especially like including those files in the git ignore. I don't think they need to be checked into the repo.

[rickecon]

@MaxGhenis @jdebacker . I think this PR is ready to merge. But I don't understand the "conflicts that must be resolved" above. When I click on Resolve conflicts, it shows me a version of the psid_data_setup.py file that is not consistent with the changes shown in the "Files changed" tab. Maybe this is just a case where Max's branch is behind the current state of the repo, and he needs to do a git fetch/merge/resolve conflicts on his end. Any clarification here would be helpful.

[jdebacker]

@MaxGhenis When conflicts are resolved on this branch, I'm very happy to merged this. B/c wealth variables are important and the psidR package no longer can be used for them, I may check back into this repo the old PSID data with wealth, just in case we need it. But I like the updates here so that things work with the latest psidR package.