Updated to latest riot + mongo_mapper