Get proper dependencies in package.xml

While it builds, I doubt it will on the farm, looks like a number of missing depends. @wjwwood -- you wanta take this one? I can work on it over the weekend otherwise, but I won't get to it today.