--HG--
rename : MERGE.txt => docs/merge.txt

Prefer local implementation to markerlib implementation as markerlib implementation is not as complete.

--HG--
extra : histedit_source : 3855347db7042dc34032b6bfa7b4c4e5239c1c3f

--HG--
extra : histedit_source : 6ed89212bff75512c980d3fc0f98117510f3b576

Merge legacy evaluation as a fallback with markerlib-based evaluation of environment markers. Fixes #14

--HG--
rename : distribute_setup.py => ez_setup.py

Updated release script to allow setting of the version to be released at release time (but still infer a next release).

Updated README to reflect preferred installation techniques, HTTPS links, and more references to bitbucket hosting. The preferred installation technique now is running 'ez_setup.py' on all platforms.

(grafted from 3b91f246d8de2f54b4b764dfe362a3677a001162)

--HG--
branch : setuptools-0.6
extra : source : 3b91f246d8de2f54b4b764dfe362a3677a001162

--HG--
branch : distribute

--HG--
branch : distribute

Catch VersionConflict in distribute_setup when checking for setuptools 0.7 (to allow upgrade from setuptools to distribute). Fixes #379

--HG--
branch : distribute