fix functional test context for permissions.

* Effectively reverts 65d5c841061401a1a71d9abd1a5da5695cc34f30. "printf
  debugging" showed that the nested context blocks were not executed at
  all, so setup for correct/incorrect permissions was not happening
  correctly
* Fixes incorrect assertion that file resources should report being
  updated when no changes were made.
Merge branch 'functional-test-context-fix'
update rspec dependency to 2.12.x

The newer version should have the support for metadata/tag filtering of
before blocks that we need for functional tests.
Stub windows detection in directory spec.
Stub windows platform detection in spec tests
Add missing stubs for File.directory?("/tmp")
Make tests unix_only where the stubs don't work on windows.

Functionality is covered by functional tests, so we have test coverage
to fall back on until the unit tests are fixed.
Merge branch 'fix-reporting-tests-windows'
remove mistaken message expectation
race condition that resolves itself?
Merge pull request #580 from opscode/lcg/tiny-server-race

race condition that resolves itself?
Merge branch 'master' into dev