Cleaning up my commenting style
Merge remote-tracking branch 'origin/resolve_urls' into embed_photos