Fix serverspec2

Just updates to fix chefspec and the newer serverspec.