Force keys to always be base class to guard against STI
merged friendly slugs changes
Merge pull request #38 from ScotterC/sti-expiry

Force keys to always be base class to guard against STI