Merge branch '90-pull' of github.com:warpc/rosa-build into 90-pull

Conflicts:
	app/models/project.rb
	app/models/pull_request.rb
	db/migrate/20120412173938_create_pull_requests.rb
	db/schema.rb
	spec/models/pull_request_spec.rb

app/models/pull_request.rb

@@ -128,6 +128,4 @@ class PullRequest < ActiveRecord::Base
     end
     # TODO catch errors
   end
-
-
 end

spec/models/pull_request_spec.rb

@@ -91,5 +91,4 @@ describe PullRequest do
     FileUtils.rm_rf(APP_CONFIG['root_path'])
     #~ FileUtils.rm_rf File.join(Rails.root, "tmp", Rails.env, "pull_requests")
   end
-
 end