Serverspec updates

Whilst I don't believe anyone uses these tests, I've gone ahead and
cleaned up some of the obvious failures.  There are two remaining
heat keystone failures due to duplicate heat keystone service names,
which I am going to leave for now.
Merge pull request #47 from mattt416/serverspec_updates

Serverspec updates