improve configuration building
curl string
accept #2 manually, Merge branch 'master' into HEAD

Conflicts:
	config.go
Merge remote-tracking branch 'origin/master'