Make gitignore and hiera consistent