Vendor in setuptools 1.1.6
Update to use new setuptools instead of distribute
Upgrade pip to 1.4.1
Merge pull request #1 from marcmoody/master

Update to use setuptools 1.1.6 and pip 1.4.1