misc changes to readme and rsync excludes
resolve conflict
add ufraw for RAW image support