Clean up and add checking for OS X version and Git