Restructure some code so specs will pass.

ChefSpecs were failing due to where some recipes were included.
Instead of splitting services runit, init, into two recipes I moved
it all into one service recipe. It's pretty sure and easier to
follow this way.