Fixing dependencies now that ZF-2 packages properly