Allowed plural :headers_dirs to be passed to vendor_project.

Temp commit - tested and working locally

Clean up code