diff --git a/lib/tasks/heroku.rake b/lib/tasks/heroku.rake
index c51f2fc..3e8ee2c 100644
--- a/lib/tasks/heroku.rake
+++ b/lib/tasks/heroku.rake
@@ -25,7 +25,7 @@ namespace :heroku do
       vars[:GOOGLE_ANALYTICS_TRACKER_ID] = ask_value('Google Analytics tracker id')
     end
 
-    if ask_yn("Use Hoptoad to store production execptions?")
+    if ask_yn("Use Hoptoad for exception notifications?")
       vars[:HOPTOAD_API_KEY] = ask_value('Hoptoad API key')
     end
 
@@ -35,8 +35,20 @@ namespace :heroku do
     end
 
     puts "Setting all config vars on Heroku app"
-    vars_string = vars.map { |k,v| "#{k}='#{v}'" }.join(' ')
-    `heroku config:add #{vars_string}`
+    if vars.any?
+      vars_string = vars.map { |k,v| "#{k}='#{v}'" }.join(' ')
+      `heroku config:add #{vars_string}`
+    end
+
+    puts "Deploying..."
+    run "git push heroku master"
+    run "heroku rake db:migrate"
+
+    puts "Opening app..."
+    run "heroku open"
+
+    puts "Rename your app at any time with..."
+    puts "heroku rename newname"
   end
 
   desc "Create a new app"
diff --git a/script/create_project b/script/create_project
index d71a71b..636cf9d 100755
--- a/script/create_project
+++ b/script/create_project
@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/boot'
-require File.join(File.dirname(__FILE__), "..", "lib", "tasks", "heroku.rake")
 require 'rubygems'
 require 'activesupport'
 require 'pathname'
@@ -55,20 +54,10 @@ end
 
 run("git commit -a -m 'New Heroku Suspenders app'")
 
-run "rake heroku:setup"
-
-puts "Deploying..."
-run "git push heroku master"
-run "heroku rake db:migrate"
-
-puts "Opening app..."
-run "heroku open"
-
 run("rake db:migrate RAILS_ENV=development")
 run("rake db:migrate RAILS_ENV=test")
 run("rake db:migrate RAILS_ENV=cucumber")
-run("rake")
 
-puts "Rename your app at any time with:"
-puts "heroku rename newname"
+puts "Next: run the tests, configure Heroku, deploy!"
+puts "cd ../#{project_name} && rake && rake heroku:setup"
 
--
libgit2 0.21.2