Conflicts:
	spec/lib/message_handler_spec.rb
	spec/spec_helper.rb

profile photo uploader is now a standard form file element.  Upload new image through people#update, which calls current_user.post to do so.

Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb

nope that last fix I was too tired.  the problem is when someone sends me a request saying it is a response from me