Integrating various builds systems. Merging. Some things are out of sync.
Tidying up the integration.
Adding mac-specific ignore.
More tidying up things to be ignored.