Fix #17 - allow for non transitive dependencies

As discussed. Has real tests, doesn't have integration tests
but will make that another ticket.

Change-Id: I9ae5e32b12cf07e5e782f7bb8d37815c06e62837
Merge "Fix #17 - allow for non transitive dependencies"