Merged in OSX files
Updated readme