Upgrade RSVP, introduce AMD shim
Build dist for new RSVP
Merge conflict on dist