Update rspec 2.x syntax to 3.x to remove deprecations
Merge branch 'master' of github.com:localshred/protobuf into wip/http

Conflicts:
	protobuf.gemspec
	spec/lib/protobuf/rpc/connectors/socket_spec.rb