fix set content-type to application/json
Merge pull request #314 from xiangli-cmu/fix-content-type

fix set content-type to application/json
Config fixes.
Merge branch 'master' of https://github.com/coreos/etcd into clean-up-config