.gitignore merge from Shadow

Merging so the master can have the correct setup w/ .gitignore