adding *hack* code to expire keys from riak; +cosmetic changes