More Mac specific configs. Tidied up git submodule that was in the wrong place