Conflicts:
	spec/models/jobs/socket_webfinger_spec.rb

remove the fixtures everytime, until we actually figure out how to do this right.  also clean up some spec helper includes to prevent everything getting included many times

remove the fixtures everytime, until we actually figure out how to do this right.  also clean up some spec helper includes to prevent everything getting included many times

Conflicts:
	spec/controllers/people_controller_spec.rb
	spec/controllers/publics_controller_spec.rb
	spec/lib/diaspora/parser_spec.rb