diff --git a/Gemfile.lock b/Gemfile.lock
index 97754fb..d6f279e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,12 +55,6 @@ GEM
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
     cancan (1.6.5)
-    capistrano (2.9.0)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
     capybara (1.1.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -97,7 +91,6 @@ GEM
       railties (>= 3.0.0)
     ffi (1.0.9)
     fssm (0.2.7)
-    highline (1.6.2)
     hike (1.2.1)
     i18n (0.6.0)
     jquery-rails (1.0.14)
@@ -111,13 +104,6 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     multi_json (1.0.3)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.2.1)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
     nilify_blanks (1.0.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -210,7 +196,6 @@ PLATFORMS
 DEPENDENCIES
   active_scaffold (~> 3.1.0)!
   cancan (~> 1.6.5)
-  capistrano (~> 2.9.0)
   capybara (~> 1.1.1)
   coffee-rails (~> 3.1.0)
   compass (~> 0.12.alpha.0)
diff --git a/README b/README
index dc0128b..932fe12 100644
--- a/README
+++ b/README
@@ -1 +1,11 @@
-Simple DNS
\ No newline at end of file
+## Simple DNS
+
+A DNS users frontend.
+
+## Tests
+
+Start Spork
+> spork rspec
+
+Run tests
+> rspec spec
diff --git a/config/deploy.rb b/config/deploy.rb
index 2a44788..64362b6 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,3 +1,5 @@
+require 'bundler/capistrano'
+
 set :application, 'simpledns'
 set :domain, 'zooz.dyndns.org'
 set :repository,  "set your repository location here" # TODO: write me
@@ -6,6 +8,12 @@ set :use_sudo, false
 set :deploy_to, '/srv/www/apps/entrydns'
 set :user, 'clyfe'
 set :scm, 'git'
+set :branch, "master"
+set :scm_verbose, true
+#set :deploy_via, :remote_cache/:export .. etc
+# set :git_enable_submodules, 1
+
+ssh_options[:forward_agent] = true # use local keys
 
 role :web, domain                   # Your HTTP server, Apache/etc
 role :app, domain                   # This may be the same as your `Web` server
@@ -13,7 +21,7 @@ role :db,  domain, :primary => true # This is where Rails migrations will run
 # role :db,  "your slave db-server here"
 
 namespace :deploy do
-  task :start, :roles => :app do
+  task :start, :roles => :app, :except => { :no_release => true } do
     run "touch #{current_release}/tmp/restart.txt"
   end
 
@@ -22,7 +30,7 @@ namespace :deploy do
   end
 
   desc "Restart Application"
-  task :restart, :roles => :app do
+  task :restart, :roles => :app, :except => { :no_release => true } do
     run "touch #{current_release}/tmp/restart.txt"
   end
 end