Upgrade image handling to eliminate external image URLs (Fixes #15)

Heavy lifting from #88 Image handling