Conflicts:
	app/helpers/application_helper.rb
	app/views/comments/_comment.html.haml
	app/views/people/_person.html.haml
	app/views/shared/_stream_element.html.haml

make the build pass (we no longer socket photos at all) and also more test fixing around request.  we were saving requests to early in the cycle, most likely cruft before it was refactored.

Add pending specs for log_overrider... hit a wall when I wanted more information than is being passed to ActiveSupport::Notifier