Allow uploading the docs
Moved MERGE.txt into the setuptools documentation.

--HG--
rename : MERGE.txt => docs/merge.txt
Adding merge FAQ as part of the project docs.
Reformatted faq for RST
Add heading
Linked FAQ
Added sections on upgrading