Updated .gitignore (and other stuff
Revert "Updated .gitignore (and other stuff"

This reverts commit 70da4a0d8a81ea614d189520531b413920f74298.
Revert "Revert "Updated .gitignore (and other stuff""

This reverts commit 18cae73753a2166097c5881f8edc3438a5d412d8.