updated the plan
Merge remote-tracking branch 'origin'
Squashed commit of the following:

commit f9093b526b35a08e5922b767768fec98ed1641fb
Author: Benjamin Crandall <ben@commongoods.net>
Date:   Wed May 8 15:50:13 2013 -0700

    indexed invitations, better link for invitation emails.