Initial 1.9.2, specs fail (possibly validatable), need to pull in aredridel photo fixes

Gemfile

@@ -47,7 +47,6 @@ group :test do
 	gem 'rspec-rails', '2.0.0.beta.17'
   gem 'mocha'
   gem 'webrat', '0.7.2.beta.1'
-  gem 'redgreen'
   gem 'autotest'
   gem 'database_cleaner'
   gem 'saucelabs-adapter', '= 0.8.12'

Gemfile.lock

@@ -180,7 +180,6 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    redgreen (1.2.2)
     rest-client (1.6.1)
       mime-types (>= 1.16)
     rspec (2.0.0.beta.22)
@@ -252,7 +251,6 @@ DEPENDENCIES
   pubsubhubbub
   rails (= 3.0.0)
   redfinger!
-  redgreen
   roxml!
   rspec (>= 2.0.0.beta.17)
   rspec-rails (= 2.0.0.beta.17)

app/models/user.rb

@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 require File.expand_path('../../../lib/diaspora/user/friending', __FILE__)
 require File.expand_path('../../../lib/diaspora/user/querying', __FILE__)
 require File.expand_path('../../../lib/diaspora/user/receiving', __FILE__)
@@ -258,20 +257,6 @@ class User
     aspect(:name => "Family")
     aspect(:name => "Work")
   end
-<<<<<<< HEAD
-
-  def self.create(opts ={})
-    puts opts.inspect
-  end
-
-  def terse_url
-    terse = self.url.gsub(/(https?:|www\.)\/\//, '')
-    terse = terse.chop! if terse[-1, 1] == '/'
-    terse
-  end
-=======
-  
->>>>>>> master
 
   def diaspora_handle
     "#{self.username}@#{APP_CONFIG[:terse_pod_url]}"