After a lot of deliberation, I like this default 

Whiny conflicts for static picks make some sense, but b/c of the vendor+
app relationship (where app is seen as overriding vendor), I think I'd
prefer to default to allowing merge conflicts with the assumption that 
callers will prioritize app over vendor.
more dirs
add webfonts
Use more file configs
Use more file configs

BREAKING this changes from a **/* glob to just dir names