Merge pull request #264 from xiangli-cmu/0.2

refactor remove extra print parameter
Add basic config.
fix headerTimeout should be longer and body should be shorter
refactor use transtiemout
Add tiered configuration.
Merge branch '0.2' of https://github.com/coreos/etcd into config
Merge branch '0.2' of https://github.com/coreos/etcd into 0.2
Fix conf extension and documentation.
Merge branch '0.2' into config

Conflicts:
	Documentation/external-documentation.md
	server/config.go
	server/config_test.go
	server/tls_info.go
	server/util.go
Merge pull request #265 from xiangli-cmu/fix-timeout

headerTimeout should be longer and body should be shorter
Merge pull request #267 from xiangli-cmu/fix-wait-handler

fix wait handler should close connection if client leaves
fix put ttl
Merge pull request #266 from benbjohnson/config

Tiered Configuration
Merge pull request #275 from xiangli-cmu/fix-put-ttl

Fix put ttl
Internal versioning.
Merge branch '0.2' of https://github.com/coreos/etcd into versioning

Conflicts:
	server/v2/put_handler.go
Merge pull request #277 from benbjohnson/versioning

Internal Versioning
Add version upgrade endpoint.
Merge pull request #278 from benbjohnson/upgrade-version

Add version upgrade endpoint.
test add integration test