diff --git a/README.md b/README.md
index 5beca0a87..e2ba0b90f 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Manual demo install and database setup:
     cp config/application-example.yml config/application.yml # and edit it
     cp config/database-example.yml config/database.yml # and edit it
     bundle exec rake db:setup:all # for production, please follow deployment howto
-    bundle exec rake:bootstrap
+    bundle exec rake bootstrap
     bundle exec rake assets:precompile
 
 ### Apache with patched mod_epp (Debian 7/Ubuntu 14.04 LTS)
diff --git a/Rakefile b/Rakefile
index ba6b733dd..223f8b92f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('../config/environment', __FILE__)
 
 Rails.application.load_tasks
diff --git a/lib/tasks/bootstrap.rake b/lib/tasks/bootstrap.rake
index 36202a6c7..1b3af2fe7 100644
--- a/lib/tasks/bootstrap.rake
+++ b/lib/tasks/bootstrap.rake
@@ -1,11 +1,11 @@
 desc 'Bootstraps production-like environment'
 task :bootstrap do
   AdminUser.create!(
-      username: 'admin',
-      email: 'admin@domain.tld',
-      password: 'adminadmin',
-      password_confirmation: 'adminadmin',
-      country_code: 'US',
-      roles: ['admin']
+    username: 'admin',
+    email: 'admin@domain.tld',
+    password: 'adminadmin',
+    password_confirmation: 'adminadmin',
+    country_code: 'US',
+    roles: ['admin']
   )
 end