use urllib2 in config.gather_bootstrap_script
config.gather_bootstrap_script: fix error in CLI example
fix issue #6954
fix #6542
pkg-search behavior was changed
Merge pull request #6993 from UtahDave/develop

split those strings on their path
Merge pull request #6987 from mgwilliams/urllib2

use urllib2 instead of urllib
Merge pull request #6988 from giantlock/develop

fix issues #6542, #6954
fixing duplicate output of modjk
changing has_key function
Improvements to the windows package manager page.

The aim is to give a bit of a high level intro and also to
aid troubleshooting.
Syntax of versionadded
Merge pull request #6997 from joehealy/windows_package_manager_doc_improvements

Improvements to the windows package manager page.
distutil.version is not in distutil all
check for multiple strings in the test
remove commented out code
use the comparability of LooseVersion to do version checking
Merge pull request #7002 from riverajo/postgres-distutil

Postgres distutil
Merge pull request #6995 from ranl/modjk

fixing duplicate output of modjk
Merge pull request #7004 from UtahDave/update_tests

Update tests
Merge pull request #6998 from holmboe/patch-1

Syntax of versionadded