merge #photo into #master

Removed (hopefully) all code related to photos.  Reverting to determine what broke our build.