iOS app that can control both Zwave (through SmartThings) and HomeKit devices?

I posted detailed instructions for the pdlove Version here. I am planning to switch to the tonesto Version when I have a little time and can post an update then.