Got this sorted with @pjz's help in [IRC](https://botbot.me/freenode/gittip/msg/12988969/)