etcdserver: clean NewServer
etcdserver: add shouldDiscover
etcdserver: add s.apply
etcdserver: Id -> ID
etcdserver: fix typo
Merge pull request #1288 from coreos/cleanup

etcdserver: clean NewServer