Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md

diff --combined README.md
index 0bf7f98,53a1599..b5df481
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -1,13 -1,13 +1,13 @@@
  Electrum-server for the Electrum client
  =========================================
  
 -  * Author: thomasv@gitorious
 +  * Author: thomasv@bitcointalk
    * Language: Python
  
  Features
  --------
  
 -  * The server uses a bitcoind and bitcoin-abe.
 +  * The server uses a bitcoind and bitcoin-abe or a leveldb backend.
    * The server code is open source. Anyone can run a server, removing single
      points of failure concerns.
    * The server knows which set of Bitcoin addresses belong to the same wallet,
@@@ -17,10 -17,9 +17,10 @@@
  Installation
  ------------
  
 -  1. Install [bitcoin-abe](https://github.com/jtobey/bitcoin-abe).
 -  2. Install [jsonrpclib](https://github.com/joshmarshall/jsonrpclib).
 -  3. Launch the server: `nohup python -u server.py > /var/log/electrum.log &`
 +  1. To install and run a pruning server (easiest setup) see README.leveldb
 +  2. Install [bitcoin-abe](https://github.com/jtobey/bitcoin-abe).
-   3. Install [jsonrpclib](https://code.google.com/p/jsonrpclib/).
++  3. Install [jsonrpclib](https://github.com/joshmarshall/jsonrpclib).
 +  4. Launch the server: `nohup python -u server.py > /var/log/electrum.log &`
       or use the included `start` script.
  
  See the included `HOWTO.md` for greater detail on the installation process.