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