Merge pull request #309 from xiangli-cmu/master

fix create folder before write info file
Merge pull request #310 from xiangli-cmu/master

test fix wrong assumption should be previous index + 501 + 6
Renamed configuration parameters.
fix set content-type to application/json
Merge pull request #314 from xiangli-cmu/fix-content-type

fix set content-type to application/json
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
Config clean up and usage messaging.
Merge pull request #317 from benbjohnson/fix-help-flag

Config clean up and usage messaging.
bump deps