Flickr adopting Aviary for photo edits, waves goodbye to Picnik