[merge] Ned Konz, Fixed spelling and added files to .gitignore