iCloud Photo Library (beta) just works, quite well. Photos all synced between devices, including edits. Can’t wait for full blown Mac app.