1) Fixing up some file names
2) Updated the git ignore