Make photo embedding update the title/summary too
Beautify the results a bit more per twitter's oembed style
Merge in changes from resolve_urls and fix conflicts