Remove more conflicts, and remove a requires for something that's not been built yet

Sighed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>
Merge pull request #80 from jonludlam/master

Remove more conflicts, and remove a requires for something that's not be...