Remove empty directories, add .gitignore to root directory
Merge remote-tracking branch 'origin/master'
gitignore: Ignore some editors' lock and backup file patterns, fix config directory line