Ensure empty storage directories are included in repo - fix .gitignore nesting issue