diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 2c3ee6f..b359fb7 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -5,8 +5,8 @@
 # Make sure the secret is at least 30 characters and all random, 
 # no regular words or you'll be exposed to dictionary attacks.
 ActionController::Base.session = {
-  :session_key => ENV['SESSION_KEY'] || "_development_session",
-  :secret      => ENV['SESSION_SECRET'] || "acae512910d591e2ab92d82781abc8f52bc723a8cc2124225a89b9e2ed05de875d2ec49c10a585bfcf40f6bfc1385b22578d9cbc7213a2cf61a9a900eaf57cfc"
+  :session_key => "_CHANGEME_session",
+  :secret      => "CHANGESESSION"
 }
 
 # Use the database for sessions instead of the cookie-based default,
diff --git a/config/s3.yml b/config/s3.yml
index 852bb19..05a56d6 100644
--- a/config/s3.yml
+++ b/config/s3.yml
@@ -13,11 +13,13 @@
 development: &default
   access_key_id: <%= ENV['S3_KEY'] %>
   secret_access_key: <%= ENV['S3_SECRET'] %>
-  bucket: <%= ENV['S3_BUCKET'] %>
+  bucket: CHANGME_development
 
 test:
   <<: *default
+  bucket: CHANGME_test
 
 production:
   <<: *default
+  bucket: CHANGME_production
 
diff --git a/lib/tasks/heroku.rake b/lib/tasks/heroku.rake
index a17d505..63acca6 100644
--- a/lib/tasks/heroku.rake
+++ b/lib/tasks/heroku.rake
@@ -14,9 +14,8 @@ namespace :heroku do
     vars = {}
 
     if ask_yn("Use Amazon S3 for Paperclip uploads?")
-      vars[:S3_KEY] = ask_value('S3 key')
+      vars[:S3_KEY]    = ask_value('S3 key')
       vars[:S3_SECRET] = ask_value('S3 secret key')
-      vars[:S3_BUCKET] = ask_value('Name of S3 bucket to store assets in')
     end
 
     if ask_yn("Use Google Analytics to track web traffic?")
@@ -28,14 +27,10 @@ namespace :heroku do
     end
 
     if ask_yn("Use GMail to send outgoing emails?")
-      vars[:GMAIL_EMAIL] = ask_value('GMail email address')
+      vars[:GMAIL_EMAIL]    = ask_value('GMail email address')
       vars[:GMAIL_PASSWORD] = ask_value('GMail password')
     end
 
-    puts "Generating a session key and session secret"
-    vars[:SESSION_KEY] = "_#{ActiveSupport::SecureRandom.hex(6)}_session"
-    vars[:SESSION_SECRET] = ActiveSupport::SecureRandom.hex(64)
-
     puts "Setting all config vars on Heroku app"
     vars_string = vars.map { |k,v| "#{k}='#{v}'" }.join(' ')
     sh "heroku config:add #{vars_string}"
--
libgit2 0.21.2