Renamed configuration parameters.
Merge branch 'master' of https://github.com/coreos/etcd into clean-up-config

Conflicts:
	etcd.go
Config fixes.
Merge branch 'master' of https://github.com/coreos/etcd into clean-up-config
Merge pull request #312 from benbjohnson/clean-up-config

Renamed Configuration Parameters