add pypi.pubyun.com
Merge pull request #14 from pubyun/master

add pypi.pubyun.com
Fix conflicts