[O] org-mac-protocol no remember window and Symbol's function definition is void: caddr from emacs server

[David Abernethy]

I have Mac OSX 10.6.8
Emacs 23.3.1 (i686-apple-darwin10.0.0, NS apple-appkit-1038.36) complied from 
source as /Applications/Emacs.app
Org-mode version 7.7
The latest clone of the git repository for org-mac-protocol
(boundp 'server-process) returns t confirming the emacs server is running
when i run org-remember on Skim there is no Remember buffer created, or entry 
in inbox.org

I get this script output (i.e. the Applescript works):

/Applications/Emacs.app/Contents/MacOS/bin/emacsclient 
org-protocol:/mac-remember:/y/skim%3A%2FUsers%2Fdavid%2FDocuments%2Fmedlit%2FStart-D%20Large-Scale%2C%20Practical%2C%20Clinical%20Trial%20for%20Patients%20With%20Depression.pdf%3A%3A3/Start-D%20Large-Scale%2C%20Practical%2C%20Clinical%20Trial%20for%20Patients%20With%20Depression.pdf%3ASkim/Start-D%20Large-Scale%2C%20Practical%2C%20Clinical%20Trial%20for%20Patients%20With%20Depression.pdf/Intervention%0AA%20systematic%20approach%20to%20treatment%20called%20measurement-based%20care:Skim

Here is the relevant part of my .emacs (from line 0)

(require 'recentf)
(recentf-mode 1)
(require 'remember)
(setq org-directory "~/org/")
(setq org-default-notes-file "~/org/inbox.org")
(require 'org-mac-protocol)
(server-start)
(setq org-remember-templates
      '(("AppleScript remember" ?y "* %:shortdesc\n  %:initial\n   Source: %u, 
%c\n\n  %?" (concat org-directory "inbox.org") "Remember")
        ("AppleScript note" ?z "* %?\n\n  Date: %u\n" (concat org-directory 
"inbox.org") "Notes")))       
(require 'org)

when I run this in a terminal I get this:

Waiting for Emacs...
*ERROR*: Symbol's function definition is void: caddr

Can anyone spot the cause of the problem please?
David