updated to feeds_2.x-dev with address, other things too, been a while since last commit.