Some dependency fixups.
Merge branch 'master' of ssh://bitbucket.org/ish/nsmbuild