serverspec 2 fixes to e2e tests

also some cleanup in the os-detection
Merge pull request #2178 from opscode/lcg/serverspec-2

serverspec 2 fixes