5 files changed, 2 insertions, 23 deletions
diff --git a/config/deploy.rb b/config/deploy.rb
index 004c3df35..5e660434a 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -19,7 +19,7 @@ server configuration['server'], :app, :web, :db, :primary => true
 namespace :rake do
   namespace :themes do
     task :install do
-      run "cd #{release_path} && bundle exec rake themes:install RAILS_ENV=#{rails_env}"
+      run "cd #{latest_release} && bundle exec rake themes:install RAILS_ENV=#{rails_env}"
     end
   end
 end
@@ -48,7 +48,6 @@ namespace :deploy do
     links = {
       "#{release_path}/config/database.yml" => "#{shared_path}/database.yml",
       "#{release_path}/config/general.yml" => "#{shared_path}/general.yml",
-      "#{release_path}/config/memcached.yml" => "#{shared_path}/memcached.yml",
       "#{release_path}/config/rails_env.rb" => "#{shared_path}/rails_env.rb",
       "#{release_path}/config/newrelic.yml" => "#{shared_path}/newrelic.yml",
       "#{release_path}/config/aliases" => "#{shared_path}/aliases",
diff --git a/config/environment.rb b/config/environment.rb
index bdeb4c983..7ffbe8701 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -43,7 +43,7 @@ require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch')
 require 'configuration'
 
 # Application version
-ALAVETELI_VERSION = '0.6.9'
+ALAVETELI_VERSION = '0.7'
 
 Rails::Initializer.run do |config|
   # Load intial mySociety config
@@ -114,8 +114,6 @@ end
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register "application/x-mobile", :mobile
 
-# The Rails cache is set up by the Interlock plugin to use memcached
-
 # Domain for URLs (so can work for scripts, not just web pages)
 ActionMailer::Base.default_url_options[:host] = Configuration::domain
 
diff --git a/config/memcached.yml-example b/config/memcached.yml-example
deleted file mode 100644
index e5d486674..000000000
--- a/config/memcached.yml-example
+++ /dev/null
@@ -1,15 +0,0 @@
-defaults:
-    namespace: whatdotheyknow
-    sessions: false
-    client: memcache-client
-development:
-    disabled: true
-    # servers:
-    #  - 127.0.0.1:11211 # Default host and port
-production:
-    servers:
-      - 127.0.0.1:11211 # Default host and port
-    # debug: true
-    # memory: 256
-    # benchmarking: false
-
diff --git a/config/memcached.yml-test b/config/memcached.yml-test
deleted file mode 100644
index 18d959876..000000000
--- a/config/memcached.yml-test
+++ /dev/null
@@ -1,2 +0,0 @@
-test:
-  disabled: true
-\ No newline at end of file
diff --git a/config/packages b/config/packages
index 775a55e38..db51e5bdd 100644
--- a/config/packages
+++ b/config/packages
@@ -23,7 +23,6 @@ unzip
 wdg-html-validator
 mutt
 tnef (>= 1.4.5)
-memcached
 gettext
 python-yaml
 wkhtmltopdf-static