Changes to accomodate moving to Git and to compiling on macOS 10.11