  					$row['speaker']['image'] = IMAGEPATH . 'mps/' . $speaker['person_id'] . '.jpg';
  				}
  				$desc = '';
+Index: twfy/www/includes/easyparliament/templates/emails/alert_confirmation.txt
+===================================================================
+RCS file: /repos/mysociety/twfy/www/includes/easyparliament/templates/emails/alert_confirmation.txt,v
+retrieving revision 1.2
+diff -u -r1.2 alert_confirmation.txt
+--- twfy/www/includes/easyparliament/templates/emails/alert_confirmation.txt	11 Aug 2006 20:55:57 -0000	1.2
++++ twfy/www/includes/easyparliament/templates/emails/alert_confirmation.txt	29 Nov 2007 02:59:34 -0000
+@@ -1,5 +1,5 @@
+-Subject: Please confirm your TheyWorkForYou.com alert
+-You have asked to subscribe to an alert at TheyWorkForYou.com
++Subject: Please confirm your OpenAustralia.org alert
++You have asked to subscribe to an alert at OpenAustralia.org
+ for the following criteria:
+ 
+ {CRITERIA}
+@@ -14,11 +14,11 @@
+ 
+ If you have not tried to register for this alert then someone else
+ entered your address. If you think this has been done maliciously
+-then let us know at volunteers@theyworkforyou.com
++then let us know at matthew@openaustralia.org
+ 
+ And don't forget to let your friends and family know about
+-TheyWorkForYou.com 
++OpenAustralia.org
+ 
+ Best wishes,
+ 
+-- The TheyWorkForYou.com Volunteers
++- The OpenAustralia.org Volunteers
+Index: twfy/www/includes/easyparliament/templates/emails/join_confirmation.txt
+===================================================================
+RCS file: /repos/mysociety/twfy/www/includes/easyparliament/templates/emails/join_confirmation.txt,v
+retrieving revision 1.1
+diff -u -r1.1 join_confirmation.txt
+--- twfy/www/includes/easyparliament/templates/emails/join_confirmation.txt	27 Apr 2006 14:20:41 -0000	1.1
++++ twfy/www/includes/easyparliament/templates/emails/join_confirmation.txt	29 Nov 2007 02:59:34 -0000
+@@ -1,7 +1,7 @@
+-Subject: Please confirm your TheyWorkForYou.com account
++Subject: Please confirm your OpenAustralia.org account
+ Hi {FIRSTNAME},
+ 
+-Welcome to TheyWorkForYou.com, the website which lets you scribble all over the margins of Hansard.
++Welcome to OpenAustralia.org, the website which lets you scribble all over the margins of Hansard.
+ 
+ Before you can log in and add comments, we need you to confirm your registration by clicking on the link below:
+ 
+@@ -9,10 +9,10 @@
+ 
+ If clicking the link above doesn't work, you may have to copy it and then paste it into the 'Location' or 'Address' box of your web browser, and then press 'enter' or 'return' on your keyboard.
+ 
+-Please feel free to email us at volunteers@theyworkforyou.com with any comments, problems or suggestions. 
++Please feel free to email us at matthew@openaustralia.org with any comments, problems or suggestions. 
+ 
+-And don't forget to let your friends and family know about TheyWorkForYou.com 
++And don't forget to let your friends and family know about OpenAustralia.org 
+ 
+ Best wishes,
+ 
+-- The TheyWorkForYou.com Volunteers
++- The OpenAustralia.org Volunteers
 Index: twfy/www/includes/easyparliament/templates/html/hansard_gid.php
 ===================================================================
 RCS file: /repos/mysociety/twfy/www/includes/easyparliament/templates/html/hansard_gid.php,v
 retrieving revision 1.13
 diff -u -r1.13 hansard_gid.php
 --- twfy/www/includes/easyparliament/templates/html/hansard_gid.php	29 Aug 2007 13:50:49 -0000	1.13
-+++ twfy/www/includes/easyparliament/templates/html/hansard_gid.php	28 Nov 2007 07:17:56 -0000
++++ twfy/www/includes/easyparliament/templates/html/hansard_gid.php	29 Nov 2007 02:59:34 -0000
 @@ -202,12 +202,12 @@
  				$speakername = ucfirst(member_full_name($speaker['house'], $speaker['title'], $speaker['first_name'], $speaker['last_name'], $speaker['constituency']));
  				?>

retrieving revision 1.7
diff -u -r1.7 config.php.incvs
--- twfy/www/includes/easyparliament/config.php.incvs	6 Nov 2007 13:30:11 -0000	1.7
+++ twfy/www/includes/easyparliament/config.php.incvs	28 Nov 2007 07:17:55 -0000
@@ -56,6 +56,8 @@
 // Web path to the directory where the site's images are kept.
 define ("IMAGEPATH", WEBPATH . "images/");

retrieving revision 1.1
diff -u -r1.1 hansard_gid.php
--- twfy/www/includes/easyparliament/templates/api/hansard_gid.php	25 Aug 2006 19:38:31 -0000	1.1
+++ twfy/www/includes/easyparliament/templates/api/hansard_gid.php	29 Nov 2007 02:59:34 -0000
@@ -18,9 +18,9 @@
 		if ($row['htype'] == '12') {
 			if (isset($row['speaker']) && count($row['speaker']) > 0) {
