Update guestbook to fix given recent changes.
Merge pull request #2399 from brendandburns/guestbook

Update guestbook to fix given recent changes.