Updating for some hashie bugs and Rspec changes.