conf/.gitignore removed
conf/ updated