integrate thresher updates
tidy up logging
add mac DS_Store to gitignore