As Google's Picnik photo editing service prepares to close up shop on April 19, Flickr has announced a partnership with a new photo editing application called Aviary. Aviary will be rolling out across Flickr over the next two weeks staring today; users can find it in the "Actions" menu.