Merge branch 'master' into dev

README.md

@@ -1,13 +1,15 @@
 shadowsocks
 ===========
 
-Current version: 2.0-pre [![Build Status]][Travis CI]
+[![PyPI version]][PyPI] [![Build Status]][Travis CI] 
+
+Current version: 2.0-pre
 
 shadowsocks is a lightweight tunnel proxy that help you get through firewalls.
 
 2.0-pre is currently experimental. Please use [1.4.x].
 
-[中文说明]
+[中文说明][Chinese Readme]
 
 Install
 -------
@@ -107,11 +109,13 @@ Also see [Troubleshooting]
 
 
 [1.4.x]:           https://github.com/clowwindy/shadowsocks/tree/1.4
-[Build Status]:    https://travis-ci.org/clowwindy/shadowsocks.png?branch=master
-[Travis CI]:       https://travis-ci.org/clowwindy/shadowsocks
-[TCP_FASTOPEN]:    https://github.com/clowwindy/shadowsocks/wiki/TCP-Fast-Open
-[Issue Tracker]:   https://github.com/clowwindy/shadowsocks/issues?state=open
+[Build Status]:    http://img.shields.io/travis/clowwindy/shadowsocks/master.svg?style=flat
+[Chinese Readme]:  https://github.com/clowwindy/shadowsocks/wiki/Shadowsocks-%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E
 [GUI client]:      https://github.com/clowwindy/shadowsocks/wiki/Ports-and-Clients
+[Issue Tracker]:   https://github.com/clowwindy/shadowsocks/issues?state=open
+[PyPI]:            https://pypi.python.org/pypi/shadowsocks
+[PyPI version]:    http://img.shields.io/pypi/v/shadowsocks.svg?style=flat
 [Supervisor]:      https://github.com/clowwindy/shadowsocks/wiki/Configure-Shadowsocks-with-Supervisor
+[TCP_FASTOPEN]:    https://github.com/clowwindy/shadowsocks/wiki/TCP-Fast-Open
+[Travis CI]:       https://travis-ci.org/clowwindy/shadowsocks
 [Troubleshooting]: https://github.com/clowwindy/shadowsocks/wiki/Troubleshooting
-[中文说明]:        https://github.com/clowwindy/shadowsocks/wiki/Shadowsocks-%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E