Merging with wotk done in PDX

spec/features/pages/login_spec.rb

@@ -31,7 +31,7 @@ describe 'Login' do
 		visit login_path
 		form = find 'form[action$="/user_sessions"]'
 		expect(form).to have_button 'Sign In'
-		expect(form).to have_field 'email_'
+		expect(form).to have_field 'email'
 		expect(form).to have_field 'password'
 		expect(form).to have_link 'facebook'
 	end
@@ -62,7 +62,7 @@ describe 'Login' do
 		it "allows you to login" do
 			visit login_path
 			form = find 'form[action$="/user_sessions"]'
-			form.find("#email_").set(user.email)
+			form.find("#email").set(user.email)
 			form.find("#password").set('secret')
 			click_button "Sign_In"
 		end

spec/features/pages/organization_registration_spec.rb

@@ -7,7 +7,7 @@ describe 'Organization Registration' do
 	before(:each) do
 		visit login_path
 		form = find 'form[action$="/user_sessions"]'
-		form.find("#email_").set(user.email)
+		form.find("#email").set(user.email)
 		form.find("#password").set('secret')
 		click_button "Sign_In"
 		visit new_organization_path

spec/support/delorean.rb

@@ -1,7 +0,0 @@
-RSpec.configure do |config|
-	config.include Delorean
-
-	config.before(:each) do
-		back_to_the_present
-	end
-end

spec/support/postgresql.rb

@@ -1,15 +1,15 @@
 RSpec.configure do |config|
 
   config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
+    #DatabaseCleaner.strategy = :transaction
+    #DatabaseCleaner.clean_with(:truncation)
   end
 
   config.before(:each) do
-    DatabaseCleaner.start
+    #DatabaseCleaner.start
   end
 
   config.after(:each) do
-    DatabaseCleaner.clean
+    #DatabaseCleaner.clean
   end
 end