Cleanup whitespace in layout, remove OS X files