Clean up rspec spec_helper inclusion
Update specs to use rspec described_class
Clean up type specs to use rspec described_class helper
Merge branch 'master-cleanup-specs'
Merge branch 'master' into 2.x