Changed .gitignore again
Finalized .gitignore changes
Added what I think are changes made by Colin