Picture follow up (picture object + deterministic location)

Addresses https://github.com/sakaiproject/Hilary/issues/317