Remove Roomkey cruft
Merge pull request #1 from johnchapin/de-roomkey-ify

Remove Roomkey cruft