Fix some orthographic mistakes
Modify .gitignore file
Merge branch 'master' to get config files