Added the ability to specify heartbeat and election timeouts as
config parameters.
Fixed test case
fix(Dockerfile): reverted unneeded changes
fix(server/config.go): ensured params are changeable from config file and env
fix(server/server.go): removed unnecessary debug line
fix(server/timeout.go): removed a commented block
style(server/transporter.go): put explicit vars to replace timeout expressions
style(tests/server_utils.go): ran gofmt to clean up indenting
Merge remote-tracking branch 'upstream/master' into feature-parametric-timeout

Conflicts:
	Dockerfile
	server/usage.go
	tests/server_utils.go
Merge branch 'feature-parametric-timeout' of https://github.com/neildunbar/etcd into neildunbar-feature-parametric-timeout
Timeout refactor.