Fixing #2112 - Transactions handle conflicting generated resources

This commit rips out all of the 'implicit resource' crap,
replacing it with a simple system that just skips
resources that the catalog says are in conflict.

Removes a bunch of code, and fixes the bug to boot.

Signed-off-by: Luke Kanies <luke@madstop.com>