diff --git a/README b/README
index 28cf4e46..5cce7ac7 100644
--- a/README
+++ b/README
@@ -8,12 +8,10 @@
 * Mailing list: http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss
 * Original developer: bsag (http://www.rousette.org.uk/)
 * Contributors: http://dev.rousette.org.uk/wiki/Tracks/Contributing/Contributors
-* Version: 1.6
+* Version: 1.7RC
 * Copyright: (cc) 2004-2008 rousette.org.uk.
 * License:  GNU GPL
 
-**An important note for version 1.6: OpenID support is broken in this release. The fix isn't trivial because of changes to the `ruby-openid` gem, so we wanted to get this version out now and fix OpenID for the next release. If you depend on OpenID integration, we recommend waiting until the next release.**
-
 All the documentation for Tracks can be found within the /doc directory. It contains a manual in HTML (manual.html) or PDF format (manual.pdf), and this includes full instructions for both new installations and upgrades from older installations of Tracks. The instructions might appear long and intimidatingly complex, but that is mostly because of the number of different platforms supported, and the different configurations which can be used (e.g. running Tracks on your local computer or on a remote server). If you choose the appropriate section for your situation (installation vs. upgrade), and use the easiest (recommended) method, you should find the instructions easy to follow. If you encounter problems, try searching the wiki, forum or mailing list (URLs above), and ask a question if you cannot find a solution to your problem.
 
 For those upgrading, change notes are available in /doc/CHANGELOG. If you are thinking about contributing towards the development of Tracks, please read /doc/README_DEVELOPERS for general information, or /doc/tracks_api_wrapper.rb for information on Tracks' API.
@@ -21,3 +19,4 @@ For those upgrading, change notes are available in /doc/CHANGELOG. If you are th
 While fully usable for everyday use, Tracks is still a work in progress. Make sure that you take sensible precautions and back up all your data frequently, taking particular care when you are upgrading.
 
 Enjoy being productive!
+
diff --git a/app/controllers/integrations_controller.rb b/app/controllers/integrations_controller.rb
index 1b071c1e..26f5f99d 100644
--- a/app/controllers/integrations_controller.rb
+++ b/app/controllers/integrations_controller.rb
@@ -1,5 +1,7 @@
 class IntegrationsController < ApplicationController
 
+  skip_before_filter :login_required, :only => :search_plugin
+
   def index
     @page_title = 'TRACKS::Integrations'
   end
@@ -22,4 +24,12 @@ class IntegrationsController < ApplicationController
     context = current_user.contexts.find params[:context_id]
     render :partial => 'applescript2', :locals => { :context => context }
   end
+
+  def search_plugin
+	@icon_data = [File.open(RAILS_ROOT + '/public/images/done.png').read].
+	  pack('m').gsub(/\n/, '')
+
+	render :layout => false
+  end
+
 end
diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb
index 8dc6a3bd..91cfc261 100644
--- a/app/controllers/login_controller.rb
+++ b/app/controllers/login_controller.rb
@@ -96,7 +96,7 @@ class LoginController < ApplicationController
     session['noexpiry'] ||= params['user_noexpiry']
     authenticate_with_open_id do |result, identity_url|
       if result.successful?
-        if @user = User.find_by_identity_url(identity_url)
+        if @user = User.find_by_open_id_url(identity_url)
           session['user_id'] = @user.id
           msg = (should_expire_sessions?) ? "will expire after 1 hour of inactivity." : "will not expire." 
           notify :notice, "Login successful: session #{msg}"
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index bad67adb..98f45cb9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -154,7 +154,7 @@ class UsersController < ApplicationController
           # error. If info is nil, it means that the user cancelled
           # the verification.
           @user.auth_type = 'open_id'
-          @user.identity_url = identity_url
+          @user.open_id_url = identity_url
           if @user.save
             notify :notice, "You have successfully verified #{identity_url} as your identity and set your authentication type to Open ID."
           else
diff --git a/app/models/user.rb b/app/models/user.rb
index 0330cead..6c0302cc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -116,11 +116,11 @@ class User < ActiveRecord::Base
   validates_confirmation_of :password  
   validates_length_of :login, :within => 3..80
   validates_uniqueness_of :login, :on => :create
-  validates_presence_of :identity_url, :if => :using_openid?
+  validates_presence_of :open_id_url, :if => :using_openid?
 
   before_create :crypt_password, :generate_token
   before_update :crypt_password
-  before_save :normalize_identity_url
+  before_save :normalize_open_id_url
 
   #for will_paginate plugin
   cattr_accessor :per_page
@@ -145,9 +145,9 @@ class User < ActiveRecord::Base
     return nil
   end
   
-  def self.find_by_identity_url(raw_identity_url)
-    normalized_identity_url = OpenIdAuthentication.normalize_url(raw_identity_url)
-    find(:first, :conditions => ['identity_url = ?', normalized_identity_url])
+  def self.find_by_open_id_url(raw_identity_url)
+    normalized_open_id_url = OpenIdAuthentication.normalize_url(raw_identity_url)
+    find(:first, :conditions => ['open_id_url = ?', normalized_open_id_url])
   end
   
   def self.no_users_yet?
@@ -235,8 +235,8 @@ protected
     crypted_password == sha1(pass)
   end
   
-  def normalize_identity_url
-    return if identity_url.nil?
-    self.identity_url = OpenIdAuthentication.normalize_url(identity_url)
+  def normalize_open_id_url
+    return if open_id_url.nil?
+    self.open_id_url = OpenIdAuthentication.normalize_url(open_id_url)
   end
 end
diff --git a/app/views/integrations/search_plugin.rxml b/app/views/integrations/search_plugin.rxml
new file mode 100644
index 00000000..f0c8b256
--- /dev/null
+++ b/app/views/integrations/search_plugin.rxml
@@ -0,0 +1,14 @@
+xml.instruct!
+
+xml.OpenSearchDescription 'xmlns' => "http://a9.com/-/spec/opensearch/1.1/" do
+
+  xml.ShortName Tracks
+  xml.Description 'Search in Tracks'
+  xml.InputEncoding 'UTF-8'
+  xml.Image("data:image/x-icon;base64," + @icon_data, 
+			'width' => '16', 'height' => '16')
+  xml.Url 'type' => 'text/html', 'method' => 'GET', 
+	'template' => url_for(:controller => 'search', :action => 'results',
+						  :only_path => false) + '?search={searchTerms}'
+end
+
diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index 82a9dc75..ba511e16 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -19,6 +19,9 @@
   
   <link rel="shortcut icon" href="<%= url_for(:controller => 'favicon.ico') %>" />
   <%= auto_discovery_link_tag(:rss, {:controller => "todos", :action => "index", :format => 'rss', :token => "#{current_user.token}"}, {:title => "RSS feed of next actions"}) %>
+<link rel="search" type="application/opensearchdescription+xml"
+      title="Tracks"
+      href="<%= search_plugin_path %>" />
 
 <script type="text/javascript">
 window.onload=function(){
diff --git a/config/environment.rb.tmpl b/config/environment.rb.tmpl
index e30c5084..b9fbcf86 100644
--- a/config/environment.rb.tmpl
+++ b/config/environment.rb.tmpl
@@ -99,11 +99,11 @@ end
 # setting this to true will make the cookies only available over HTTPS
 TRACKS_COOKIES_SECURE = false  
 
-tracks_version='1.7-devel'
+tracks_version='1.7RC'
 
 # comment out next two lines if you do not want (or can not) the date of the 
 # last git commit in the footer
-info=`git log --pretty=format:"%ai" -1`
-tracks_version=tracks_version + ' ('+info+')'
+# info=`git log --pretty=format:"%ai" -1`
+# tracks_version=tracks_version + ' ('+info+')'
 
 TRACKS_VERSION=tracks_version
diff --git a/config/routes.rb b/config/routes.rb
index dcefa53a..2fd52714 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -65,6 +65,7 @@ ActionController::Routing::Routes.draw do |map|
 
   map.preferences 'preferences', :controller => 'preferences', :action => 'index'
   map.integrations 'integrations', :controller => 'integrations', :action => 'index'
+  map.search_plugin '/integrations/search_plugin.xml', :controller => 'integrations', :action => 'search_plugin', :format => 'xml'
 
   map.resources :recurring_todos,
     :member => {:toggle_check => :put, :toggle_star => :put}
diff --git a/db/migrate/044_upgrade_open_id.rb b/db/migrate/044_upgrade_open_id.rb
index 1ebd91ef..74307df9 100644
--- a/db/migrate/044_upgrade_open_id.rb
+++ b/db/migrate/044_upgrade_open_id.rb
@@ -12,8 +12,6 @@ class UpgradeOpenId < ActiveRecord::Migration
       t.string :salt, :null => false
     end
     
-    add_column :users, :identity_url, :string
-    
     drop_table :open_id_associations
     drop_table :open_id_nonces
     drop_table :open_id_settings
@@ -41,7 +39,5 @@ class UpgradeOpenId < ActiveRecord::Migration
       t.string "setting"
       t.binary "value"
     end
-
-    remove_column :users, :identity_url
   end
 end
diff --git a/db/tracks-15-blank.db b/db/tracks-17-blank.db
similarity index 74%
rename from db/tracks-15-blank.db
rename to db/tracks-17-blank.db
index aff96bb2..1e6d759a 100644
Binary files a/db/tracks-15-blank.db and b/db/tracks-17-blank.db differ
diff --git a/db/tracks-15-example.db b/db/tracks-17-example.db
similarity index 69%
rename from db/tracks-15-example.db
rename to db/tracks-17-example.db
index 97f586c7..d03c2db5 100644
Binary files a/db/tracks-15-example.db and b/db/tracks-17-example.db differ
diff --git a/db/tracks_1.5_content.sql b/db/tracks_1.7_content.sql
similarity index 60%
rename from db/tracks_1.5_content.sql
rename to db/tracks_1.7_content.sql
index e593372f..150448ba 100644
--- a/db/tracks_1.5_content.sql
+++ b/db/tracks_1.7_content.sql
@@ -5,15 +5,15 @@
 -- Dump of table contexts
 -- ------------------------------------------------------------
 
-INSERT INTO "contexts" VALUES(1,'agenda',1,'f',1,'2008-02-25 20:21:09','2008-02-25 20:21:09');
-INSERT INTO "contexts" VALUES(2,'call',2,'f',1,'2008-02-25 20:21:09','2008-02-25 20:21:09');
-INSERT INTO "contexts" VALUES(3,'email',3,'f',1,'2008-02-25 20:21:09','2008-02-25 20:21:09');
-INSERT INTO "contexts" VALUES(4,'errand',4,'f',1,'2008-02-25 20:21:09','2008-02-25 20:21:09');
-INSERT INTO "contexts" VALUES(5,'lab',5,'f',1,'2008-02-25 20:21:09','2008-02-25 20:21:09');
-INSERT INTO "contexts" VALUES(6,'library',6,'f',1,'2008-02-25 20:21:09','2008-02-25 20:21:09');
-INSERT INTO "contexts" VALUES(7,'freetime',7,'f',1,'2008-02-25 20:21:09','2008-02-25 20:21:09');
-INSERT INTO "contexts" VALUES(8,'office',8,'f',1,'2008-02-25 20:21:09','2008-02-25 20:21:09');
-INSERT INTO "contexts" VALUES(9,'waiting for',9,'f',1,'2008-02-25 20:21:09','2008-02-25 20:21:09');
+INSERT INTO "contexts" VALUES(1,'agenda',1,'f',1,'2008-02-25 20:21:09','2008-03-24 19:23:53');
+INSERT INTO "contexts" VALUES(2,'call',2,'f',1,'2008-02-25 20:21:09','2008-03-24 19:23:53');
+INSERT INTO "contexts" VALUES(3,'email',3,'f',1,'2008-02-25 20:21:09','2008-03-24 19:23:53');
+INSERT INTO "contexts" VALUES(4,'errand',4,'f',1,'2008-02-25 20:21:09','2008-03-24 19:23:53');
+INSERT INTO "contexts" VALUES(5,'lab',5,'f',1,'2008-02-25 20:21:09','2008-03-24 19:23:53');
+INSERT INTO "contexts" VALUES(6,'library',6,'f',1,'2008-02-25 20:21:09','2008-03-24 19:23:53');
+INSERT INTO "contexts" VALUES(7,'freetime',7,'f',1,'2008-02-25 20:21:09','2008-03-24 19:23:53');
+INSERT INTO "contexts" VALUES(8,'office',8,'f',1,'2008-02-25 20:21:09','2008-03-24 19:23:53');
+INSERT INTO "contexts" VALUES(9,'waiting for',9,'f',1,'2008-02-25 20:21:09','2008-03-24 19:23:53');
 
 -- Dump of table notes
 -- ------------------------------------------------------------
@@ -25,33 +25,33 @@ INSERT INTO "notes" VALUES(2,1,1,'Should I go for a swirly effect or a whooshy o
 -- Dump of table projects
 -- ------------------------------------------------------------
 
-INSERT INTO "projects" VALUES(1,'Build a working time machine',1,1,'','active','2008-02-25 20:21:09','2008-02-25 20:21:09',NULL,NULL);
-INSERT INTO "projects" VALUES(2,'Make more money than Billy Gates',2,1,'','active','2008-02-25 20:21:09','2008-02-25 20:21:09',NULL,NULL);
-INSERT INTO "projects" VALUES(3,'Evict dinosaurs from the garden',3,1,'','active','2008-02-25 20:21:09','2008-02-25 20:21:09',NULL,NULL);
+INSERT INTO "projects" VALUES(1,'Build a working time machine',1,1,'','active','2008-02-25 20:21:09','2008-03-24 19:23:53',NULL,NULL);
+INSERT INTO "projects" VALUES(2,'Make more money than Billy Gates',2,1,'','active','2008-02-25 20:21:09','2008-03-24 19:23:53',NULL,NULL);
+INSERT INTO "projects" VALUES(3,'Evict dinosaurs from the garden',3,1,'','active','2008-02-25 20:21:09','2008-03-24 19:23:53',NULL,NULL);
 
 
 -- Dump of table schema_info
 -- ------------------------------------------------------------
 
-INSERT INTO "schema_info" VALUES(37);
+INSERT INTO "schema_migrations" VALUES('44');
 
 
 -- Dump of table todos
 -- ------------------------------------------------------------
 
-INSERT INTO "todos" VALUES(1,1,2,'Call Bill Gates to find out how much he makes per day',NULL,'2006-06-03 14:36:02','2006-06-24',NULL,1,NULL,'active');
-INSERT INTO "todos" VALUES(2,2,3,'Call dinosaur exterminator','Ask him if I need to hire a skip for the corpses.','2006-06-10 14:36:02','2006-06-24',NULL,1,NULL,'active');
-INSERT INTO "todos" VALUES(3,4,NULL,'Buy milk',NULL,'2006-06-10 14:36:02',NULL,NULL,1,NULL,'completed');
-INSERT INTO "todos" VALUES(4,4,NULL,'Buy bread',NULL,'2006-06-10 14:36:02',NULL,NULL,1,NULL,'completed');
-INSERT INTO "todos" VALUES(5,5,1,'Construct time dilation device',NULL,'2006-06-10 14:36:02',NULL,NULL,1,NULL,'active');
-INSERT INTO "todos" VALUES(6,2,1,'Phone Grandfather to ask about the paradox','Added some _notes_.','2006-06-10 14:36:02','2006-06-03',NULL,1,NULL,'active');
-INSERT INTO "todos" VALUES(7,6,3,'Get a book out of the library','Dinosaurs''R','2006-06-10 14:36:02',NULL,NULL,1,NULL,'active');
-INSERT INTO "todos" VALUES(8,4,NULL,'Upgrade to Rails 0.9.1',NULL,'2006-06-10 14:36:02','2006-06-10',NULL,1,NULL,'completed');
-INSERT INTO "todos" VALUES(9,1,NULL,'This should be due today',NULL,'2006-06-10 14:36:02','2006-06-10',NULL,1,NULL,'active');
-INSERT INTO "todos" VALUES(10,1,NULL,'foo',NULL,'2006-06-10 14:36:02','2005-01-05',NULL,1,NULL,'completed');
-INSERT INTO "todos" VALUES(11,1,2,'Buy shares',NULL,'2006-06-10 14:36:02','2005-02-01',NULL,1,NULL,'active');
-INSERT INTO "todos" VALUES(12,1,3,'Buy stegosaurus bait',NULL,'2006-06-10 14:36:02','2006-06-17',NULL,1,NULL,'active');
-INSERT INTO "todos" VALUES(13,1,3,'New action in context','Some notes','2006-06-10 14:36:02','2006-06-17',NULL,1,NULL,'active');
-INSERT INTO "todos" VALUES(14,2,2,'Call stock broker','tel: 12345','2006-06-03 14:36:02',NULL,NULL,1,NULL,'active');
+INSERT INTO "todos" VALUES(1,1,2,'Call Bill Gates to find out how much he makes per day',NULL,'2006-06-03 14:36:02','2006-06-23 23:00:00',NULL,1,NULL,'active',NULL,'2006-06-03 14:36:02');
+INSERT INTO "todos" VALUES(2,2,3,'Call dinosaur exterminator','Ask him if I need to hire a skip for the corpses.','2006-06-10 14:36:02','2006-06-23 23:00:00',NULL,1,NULL,'active',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(3,4,NULL,'Buy milk',NULL,'2006-06-10 14:36:02',NULL,NULL,1,NULL,'completed',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(4,4,NULL,'Buy bread',NULL,'2006-06-10 14:36:02',NULL,NULL,1,NULL,'completed',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(5,5,1,'Construct time dilation device',NULL,'2006-06-10 14:36:02',NULL,NULL,1,NULL,'active',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(6,2,1,'Phone Grandfather to ask about the paradox','Added some _notes_.','2006-06-10 14:36:02','2006-06-02 23:00:00',NULL,1,NULL,'active',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(7,6,3,'Get a book out of the library','Dinosaurs''R','2006-06-10 14:36:02',NULL,NULL,1,NULL,'active',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(8,4,NULL,'Upgrade to Rails 0.9.1',NULL,'2006-06-10 14:36:02','2006-06-09 23:00:00',NULL,1,NULL,'completed',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(9,1,NULL,'This should be due today',NULL,'2006-06-10 14:36:02','2006-06-09 23:00:00',NULL,1,NULL,'active',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(10,1,NULL,'foo',NULL,'2006-06-10 14:36:02','2005-01-05 00:00:00',NULL,1,NULL,'completed',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(11,1,2,'Buy shares',NULL,'2006-06-10 14:36:02','2005-02-01 00:00:00',NULL,1,NULL,'active',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(12,1,3,'Buy stegosaurus bait',NULL,'2006-06-10 14:36:02','2006-06-16 23:00:00',NULL,1,NULL,'active',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(13,1,3,'New action in context','Some notes','2006-06-10 14:36:02','2006-06-16 23:00:00',NULL,1,NULL,'active',NULL,'2006-06-10 14:36:02');
+INSERT INTO "todos" VALUES(14,2,2,'Call stock broker','tel: 12345','2006-06-03 14:36:02',NULL,NULL,1,NULL,'active',NULL,'2006-06-03 14:36:02');
 
 
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 7cb7dcfc..a4076b85 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,19 +1,18 @@
 = Tracks: a GTD web application, built with Ruby on Rails
 
-* Homepage: http://www.rousette.org.uk/projects/
-* Author: bsag (http://www.rousette.org.uk/)
-* Contributors: Nicholas Lee, Lolindrath, Jim Ray, Arnaud Limbourg, Timothy Martens, Luke Melia, John Leonard, Jim Strupp, Eric Lesh, Damien Cirotteau, Janet Riley, Reinier Balt, Jacqui Maher, James Kebinger, Jeffrey Gipson, Eric Allen
-* Version: 1.6
-* Copyright: (cc) 2004-2008 rousette.org.uk
-* License: GNU GPL
+* Project homepage: http://www.rousette.org.uk/projects/
+* GitHub: http://github.com/bsag/tracks/
+* Trac (for bug reports and feature requests): http://dev.rousette.org.uk/report/6
+* Wiki (community contributed information): http://www.rousette.org.uk/projects/wiki/
+* Forum: http://www.rousette.org.uk/projects/forums/
+* Mailing list: http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss
+* Original developer: bsag (http://www.rousette.org.uk/)
+* Contributors: http://dev.rousette.org.uk/wiki/Tracks/Contributing/Contributors
+* Version: 1.7
+* Copyright: (cc) 2004-2008 rousette.org.uk.
+* License:  GNU GPL
 
-Main project site: http://www.rousette.org.uk/projects/
-
-Trac (for bug reports and feature requests): http://dev.rousette.org.uk/report/6
-
-Wiki (deprecated - please use Trac): http://www.rousette.org.uk/projects/wiki/
-
-== Version 1.7dev
+== Version 1.7RC
 
 New features:
 1. Recurring todos
@@ -23,10 +22,12 @@ New features:
 5. New buttons to quickly defer an action 1 or 7 days
 6. Calendar view to review due actions, includes iCal feed to use in your calendar app (tested with Google Calendar, Evolution, Outlook 2007) 
 7. You can now sort projects on number of active todos
+8. Support for OpenSearch. This means you can add a Tracks as a search provider in your webbrowser (tested on FF3 and IE7)
 
 Under the hood:
-1. Move selenium tests to RSpec 
-2. Bugfixes
+1. Started to move selenium tests to RSpec 
+2. Upgrade to Rails 2.2.2
+2. Bugfixes, including fixing OpenID
 
 == Version 1.6
 1. upgrade to rails 2.0.2
diff --git a/doc/manual.markdown b/doc/manual.markdown
index 14ff22e5..7f308e7b 100644
--- a/doc/manual.markdown
+++ b/doc/manual.markdown
@@ -1,8 +1,8 @@
-Title:              Tracks 1.6 Manual
+Title:              Tracks 1.7 Manual
 Author:             Tracks Development Team
 Date:               2008-04-07
-Revision:           $Id: manual.markdown 864 2008-06-03 17:01:00Z bsag $
-Version:            1.6
+Revision:           $Id: manual.markdown 864 2008-12-09 09:30:00Z bsag $
+Version:            1.7
 Copyright:			    2008 rousette.org.uk  
 					This work is licensed under a Creative Commons License.  
 					http://creativecommons.org/licenses/by-nc-sa/3.0/
@@ -14,15 +14,13 @@ CSS:                manual.css
 
 <!-- The HTML file manual.html is generated from manual.markdown, so make edits to the *.markdown file -->
 
-# Installing Tracks 1.6 #
+# Installing Tracks 1.7 #
 
 ## Introduction ##
 
-**An important note for version 1.6: OpenID support is broken in this release. The fix isn't trivial because of changes to the `ruby-openid` gem, so we wanted to get this version out now and fix OpenID for the next release. If you depend on OpenID integration, we recommend waiting until the next release.**
+Tracks 1.7 has been thoroughly beta tested by a large number of people, and should be fully stable for everyday use. However, once set up, Tracks will contain the majority of your plans for your work and personal life, so it's only sensible to make sure that you have frequent, reliable backups of your data. Full changenotes on the release can be found in `doc/CHANGELOG`. Full API documentation can be found at `doc/app/index.html`, once you have run `rake appdoc`
 
-Tracks 1.6 has been thoroughly beta tested by a large number of people, and should be fully stable for everyday use. However, once set up, Tracks will contain the majority of your plans for your work and personal life, so it's only sensible to make sure that you have frequent, reliable backups of your data. Full changenotes on the release can be found in `doc/CHANGELOG`. Full API documentation can be found at `doc/app/index.html`, once you have run `rake appdoc`
-
-There are two methods of downloading Tracks 1.6:
+There are two methods of downloading Tracks 1.7:
 
 1. (Recommended for most people) Download the [zipped package](http://www.rousette.org.uk/projects/files/tracks-current.zip), and unzip in your preferred location (e.g. `~/Sites` for Mac OS X users).
 2. If you want to live on the edge, you can get the latest development version from GitHub using git (bear in mind that this may be less stable than the released versions):
@@ -50,7 +48,7 @@ If you'd like an easy way to access Tracks from any internet-connected computer,
 ### What is included with the Tracks package ###
 
 1. Tracks itself
-2. Rails 2.0.2 (installed in the `/vendor/rails` directory, so you do not need to install Rails yourself)
+2. Rails 2.2.2 (installed in the `/vendor/rails` directory, so you do not need to install Rails yourself)
 3. An empty SQLite3 database, set up with the correct database schema
 
 ### What you need to install [whatyouneed] ###
@@ -61,18 +59,18 @@ If you don't want to (or can't) use one of the all in one installations, you'll
 2. **RubyGems**. The gems needed by Rails to interact with the database have to be compiled on the platform on which they will be run, so we cannot include them with the Tracks package, unlike some other gems. So you will need to [download](http://rubyforge.org/frs/?group_id=126) and install RubyGems (run `ruby setup.rb` after extracting the package). Note that once again, Mac OS X Leopard users get an easy life, because RubyGems and the SQLite3 gem is already installed. Once installed you can use RubyGems to install the gems you need for your database. If you are using SQLite3, run `sudo gem install sqlite3-ruby`, then select the appropriate package for your platform (version 1.2.1 recommended). You can use MySQL without installing a gem, but installing the gem can speed things up a bit: `sudo install gem mysql`. If you're using Leopard, there are a few work-arounds necessary, which are explained on [Mac OS Forge](http://trac.macosforge.org/projects/ruby/wiki/Troubleshooting#IcannotbuildrubymysqlonLeopardwithmysql.combinaries). The ruby-mysql bindings can sometimes be a bit troublesome to install, so to be honest, it's probably not worth the bother unless you are trying to wring maximum speed out of your system. If you are using PostgreSQL, then you can install a postgres gem: `gem install postgres`.
 3. **Database**. The easiest option is to use SQLite3, as the database is included in the package. All you need then is the `sqlite3-ruby` gem, as described in step 2, and the SQLite3 libraries and binary (see [sqlite.org](http://sqlite.org/download.html) for downloads and installation instructions). If you want to use MySQL, download and install a package for your platform from [MySQL.com](http://dev.mysql.com/downloads/mysql/5.0.html). The basic steps for Postgresql should be similar to those for MySQL, but they will not be discussed further here.
 
-If you are using Unix, you might find [this guide](http://www.cooldown.com.ar/2006/12/16/install-tracks-on-ubuntu-or-debian/) by c00i90wn helpful. It was written for Tracks 1.043, but it should work for Tracks 1.6.
+You can find several installation howtos for specific setups [here](http://dev.rousette.org.uk/wiki/Tracks/Install). They were contributed by various Tracks users.
 
 ## Installation ##
 
-This description is intended for people installing Tracks from scratch. If you would like to upgrade an existing installation, please see [Upgrading to Tracks 1.6][upgrading].
+This description is intended for people installing Tracks from scratch. If you would like to upgrade an existing installation, please see [Upgrading to Tracks 1.7][upgrading].
 
 1. [Unzip tracks][unzip_install] and install in a directory
 2. Decide on a [database][database_install] to use
-  1.  SQLite3 - change database.yml to point to SQLite3 database
+  1.  SQLite3 - change database.yml to point to SQLite3 database. Make sure you add the complete path to the database
   2.  MySQL - create new MySQL db and grant all privileges 
 3. [Configure some variables][config_install]
-4. Populate the database with the [Tracks 1.6 schema][rake_install]
+4. Populate the database with the [Tracks 1.7 schema][rake_install]
 5. [Start the server][startserver_install]
 6. [Visit Tracks in a browser][signup_install]
 7. [Customise Tracks][customise_install]
@@ -86,34 +84,34 @@ Unzip the package and move Tracks into the directory you want to run it from. Fo
 Before you go any further, you need to decide which database you will use. See the [What you need to install][whatyouneed] section for details on installing the required components for you choice of database.
 
 1. **SQLite3**. All you need to do is make sure that you point Tracks to the included SQLite3 database in `/db` in the next step, [Configure variables][config_install].
-2. **MySQL**. Once you have MySQL installed, you need to create a database to use with Tracks 1.6. Go into a terminal and issue the following commands:
+2. **MySQL**. Once you have MySQL installed, you need to create a database and database-user to use with Tracks 1.7. For this, you can use MySQL Administrator or go into a terminal and issue the following commands:
 <pre>
 <code>
     mysql -uroot -p
-    mysql> CREATE DATABASE tracks15;
-    mysql> GRANT ALL PRIVILEGES ON tracks15.* TO yourmysqluser@localhost \
+    mysql> CREATE DATABASE tracks16;
+    mysql> GRANT ALL PRIVILEGES ON tracks16.* TO yourmysqluser@localhost \
     IDENTIFIED BY 'password-goes-here' WITH GRANT OPTION;
 </code>
 </pre>
 
 ### Configure variables [config_install] ###
 
-1. If you downloaded Tracks 1.6 via Subversion, you need to duplicate the files `database.yml.tmpl` and `environment.yml.tmpl` and remove the `*.tmpl` extension from the duplicates. Similarly, duplicate `/log.tmpl` and remove the `*.tmpl` extension, then edit the files as described in steps 2 and 3.
+1. If you downloaded Tracks 1.7 via Subversion, you need to duplicate the files `database.yml.tmpl` and `environment.yml.tmpl` and remove the `*.tmpl` extension from the duplicates. Similarly, duplicate `/log.tmpl` and remove the `*.tmpl` extension, then edit the files as described in steps 2 and 3.
 2. Open the file `/config/database.yml` and edit the `production:` section with the details of your database. If you are using MySQL the `adapter:` line should read `adapter: mysql`, `host: localhost` (in the majority of cases), and your username and password should match those you assigned when you created the database. If you are using SQLite3, you should have only two lines under the production section: `adapter: sqlite3` and `database: db/tracks-15-blank.db`. If you downloaded the zipped file, the database.yml file is already configured to use the provided SQLite3 file.
-3. Open the file `/config/environment.rb`, and read through the settings to make sure that they suit your setup. In most cases, all you need to change is the `SALT = "change-me"` line (change the string "change-me" to some other string of your choice), and the time zone setting.
+3. Open the file `/config/environment.rb`, and read through the settings to make sure that they suit your setup. In most cases, all you need to change is the `SALT = "change-me"` line (change the string "change-me" to some other string of your choice), and the time zone setting. For the time zone setting, most people will only want to change the config.time_zone option and leave the timezone to use in your database to :utc
 4. If you are using Windows, you may need to check the 'shebang' lines (`#!/usr/bin/env ruby`) of the `/public/dispatch.*` files and all the files in the `/script` directory. They are set to `#!/usr/bin/env ruby` by default. This should work for all *nix based setups (Linux or Mac OS X), but Windows users will probably have to change it to something like `#c:/ruby/bin/ruby` to point to the Ruby binary on your system.
 
-### Populate your database with the Tracks 1.6 schema [rake_install] ###
+### Populate your database with the Tracks 1.7 schema [rake_install] ###
 
-Open a terminal and change into the root of your Tracks 1.6 directory. Enter the following command:
+Open a terminal and change into the root of your Tracks 1.7 directory. Enter the following command:
 
 `rake db:migrate RAILS_ENV=production`
 
-This will update your database with the required schema for Tracks 1.6. If you are using SQLite3, it is not strictly necessary, because the SQLite3 database included with Tracks already has the schema included in it, but it should not do any harm to run the command (nothing will happen if it is up to date).
+This will update your database with the required schema for Tracks 1.7. If you are using SQLite3, it is not strictly necessary, because the SQLite3 database included with Tracks already has the schema included in it, but it should not do any harm to run the command (nothing will happen if it is up to date).
 
 ### Start the server [startserver_install] ###
 
-While still in the Terminal inside the Tracks 1.6 root directory, issue the following command:
+While still in the Terminal inside the Tracks 1.7 root directory, issue the following command:
 
 `script/server -e production`
 
@@ -127,7 +125,19 @@ Visit `http://0.0.0.0:3000/signup` in a browser (or whatever URL and port was re
 
 Once logged in, add some Contexts and Projects, and then go ahead and add your actions. You might also want to visit the Preferences page to edit various settings to your liking. Have fun!
 
-# Upgrading to Tracks 1.6 [upgrading] #
+# Upgrading to Tracks 1.7 [upgrading] #
+
+## Upgrading from Tracks 1.6 [upgrading_1.6] ##
+
+You will need to upgrade your `config/environment.rb` with the new content from `config/environment.rb.tmpl` included in 1.7, as the format of this file has changed a bit between 1.6 and 1.7. Also, there were some database changes in Tracks 1.7, so you need to migrate to them.
+
+1. [Back up][backup_upgrade] your existing database and installation of Tracks
+2. [Install Tracks 1.7][install_upgrade] in a new directory
+3. [Copy over][config_upgrade] a few configuration files from your Tracks 1.6 directory. If using SQLite3, copy the old database into the new Tracks 1.7 directory.
+4. Rebuild your environment.rb from the updated environment.rb.tmpl
+5. Run `rake db:migrate RAILS_ENV=production` to [update your old database][rake_upgrade] to the new schema -- you did back up your database didn't you?
+6. Run `script/server` inside your Tracks 1.7 directory to [start up Tracks 1.7][startserver_upgrade].
+7. Once you are happy that everything is working well, [delete your old Tracks directory][cleanup_upgrade].
 
 ## Upgrading from Tracks 1.5 [upgrading_1.5] ##
 
@@ -136,9 +146,9 @@ There are no changes to the database between 1.5 and 1.6, but you will need to u
 1. [Back up][backup_upgrade] your existing database and installation of Tracks
 2. [Install Tracks 1.6][install_upgrade] in a new directory
 3. [Copy over][config_upgrade] a few configuration files from your Tracks 1.043 directory. If using SQLite3, copy the old database into the new Tracks 1.6 directory
-4. Run `script/server` inside your Tracks 1.6 directory to [start up Tracks 1.6][startserver_upgrade].
-5. Once you are happy that everything is working well, [delete your old Tracks directory][cleanup_upgrade].
-
+4. Rebuild your environment.rb from the updated environment.rb.tmpl
+5. Run `script/server` inside your Tracks 1.6 directory to [start up Tracks 1.6][startserver_upgrade].
+6. Once you are happy that everything is working well, [delete your old Tracks directory][cleanup_upgrade].
 
 ## Upgrading from Tracks 1.043 [upgrading_1043] ##
 
@@ -157,11 +167,11 @@ It's very important that you **back up your database** before you start the upgr
 
 `mysqldump –-user [user name] –-password=[password] [database name] > [dump file]`
 
-Rename your old Tracks installation (e.g. to 'tracks-old') so that you can install Tracks 1.6 along side it.
+Rename your old Tracks installation (e.g. to 'tracks-old') so that you can install Tracks 1.7 along side it.
 
-### Install Tracks 1.6 [install_upgrade] ###
+### Install Tracks 1.7 [install_upgrade] ###
 
-There are two methods of downloading Tracks 1.6:
+There are two methods of downloading Tracks 1.7:
 
 1. (Recommended for most people) Download the [zipped package](http://www.rousette.org.uk/projects/files/tracks-current.zip), and unzip in your preferred location (e.g. `~/Sites` for Mac OS X users).
 2. If you want to live on the edge, you can get the latest development version from GitHub using git (bear in mind that this may be less stable than the released versions):
@@ -179,14 +189,14 @@ There are two methods of downloading Tracks 1.6:
 There are a few files you need to copy over from your old installation. If you copy them over rather than moving them, you can still run your old version of Tracks if anything goes awry with the installation process.
 
 1. Copy `/config/database.yml` from your old Tracks directory to the same location in the new one. Double check that the information there is still correct.
-2. Duplicate `/config/environment.rb.tmpl` in the Tracks 1.6 directory, and rename the file to `environment.rb`. Open the file and alter the line `SALT = "change-me"` so that it matches what you had in this file in your old installation. You may also want to change the time zone setting as appropriate for your location (`ENV['TZ'] = 'US/Eastern'`). If you have made any other customisations to `environment.rb` in the past, copy those over, but the contents of the file have changed quite a lot since 1.043, so check it carefully.
+2. Duplicate `/config/environment.rb.tmpl` in the Tracks 1.7 directory, and rename the file to `environment.rb`. Open the file and alter the line `SALT = "change-me"` so that it matches what you had in this file in your old installation. You may also want to change the time zone setting as appropriate for your location. If you have made any other customisations to `environment.rb` in the past, copy those over, but the contents of the file have slightly changed since 1.5, so check it carefully.
 3. Copy your `/log` directory over from your old installation to the root of the new one, or just rename `/log.tmpl` to `log` to start afresh.
 4. If you are using SQLite3, copy your database from `/db` in your old Tracks directory to the same location in the new one.
 5. If you are using Windows, you may need to check the 'shebang' lines (`#!/usr/bin/env ruby`)[^env] of the `/public/dispatch.*` files and all the files in the `/script` directory. They are set to `#!/usr/bin/env ruby` by default. Check the format of those lines in your old installation, and change the new ones as necessary.
 
 ### Update your old database to the new format [rake_upgrade] ###
 
-In a terminal, change directories so that you are inside the Tracks 1.6 directory. Then issue the command to update your Tracks 1.043 database to the format required for Tracks 1.6:
+In a terminal, change directories so that you are inside the Tracks 1.7 directory. Then issue the command to update your Tracks 1.6 database to the format required for Tracks 1.7:
 
 `rake db:migrate RAILS_ENV=production`
 
@@ -194,7 +204,7 @@ Watch the output carefully for errors, but it should report at the end of the pr
 
 ### Start the server [startserver_upgrade] ###
 
-If you're still in the Tracks 1.6 root directory in a terminal, enter the following command to start up Tracks in production mode:
+If you're still in the Tracks 1.7 root directory in a terminal, enter the following command to start up Tracks in production mode:
 
 `script/server -e production`
 
@@ -203,7 +213,7 @@ Visit the URL indicated by the output (e.g. `** Mongrel available at 0.0.0.0:300
 
 ### Clean up your old installation [cleanup_upgrade] ###
 
-Once you're certain that your new Tracks 1.6 installation is working perfectly, you can delete your old Tracks directory.
+Once you're certain that your new Tracks 1.7 installation is working perfectly, you can delete your old Tracks directory.
 
 [^env]: The `env` binary helps to locate other binaries, regardless of their location. If you don't have `env` installed, you'll need to change this line to point to the location of your Ruby binary.
 
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 654d5a4e..26c5b0cb 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -326,18 +326,18 @@ class UserTest < Test::Rails::TestCase
     assert_nil users(:other_user).remember_token
   end
   
-  def test_normalizes_identity_url_on_save
+  def test_normalizes_open_id_url_on_save
     ['www.johndoe.com', 'WWW.JOHNDOE.COM', 'http://www.johndoe.com/', 'http://www.johndoe.com'].each do |initial|
-      assert_identity_url_normalized_on_save initial, 'http://www.johndoe.com/'
+      assert_open_id_url_normalized_on_save initial, 'http://www.johndoe.com/'
     end
   end
   
-  def test_normalizes_identity_url_on_find
+  def test_normalizes_open_id_url_on_find
      u = users(:other_user)
-     u.identity_url = 'http://www.johndoe.com'
+     u.open_id_url = 'http://www.johndoe.com'
      u.save
-     ['www.johndoe.com', 'WWW.JOHNDOE.COM', 'http://www.johndoe.com/', 'http://www.johndoe.com'].each do |raw_identity_url|
-       assert_equal u.id, User.find_by_identity_url(raw_identity_url).id
+     ['www.johndoe.com', 'WWW.JOHNDOE.COM', 'http://www.johndoe.com/', 'http://www.johndoe.com'].each do |raw_open_id_url|
+       assert_equal u.id, User.find_by_open_id_url(raw_open_id_url).id
      end
   end
   
@@ -348,11 +348,11 @@ class UserTest < Test::Rails::TestCase
       User.create({ :login => 'quire', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
     end
     
-    def assert_identity_url_normalized_on_save(initial, expected)
+    def assert_open_id_url_normalized_on_save(initial, expected)
       u = users(:other_user)
-      u.identity_url = initial
+      u.open_id_url = initial
       u.save
-      assert_equal expected, u.identity_url
+      assert_equal expected, u.open_id_url
     end
     
 end