.gitignore, names updated; Fixes #1, #2