Clean up redundant service definitions
Get rid of duplicate resource definitions
Fix #16
Condense number of Kitchen suites
Merge pull request #27 from RoboticCheese/jdh-remove-redundant-service-definitions

Remove duplicate resource definitions