Merge branch '2014_07_remove_pyminer' of git://github.com/laanwj/bitcoin into merge-pyminer

Author: Jeff Garzik

contrib/README.md

@@ -19,10 +19,6 @@ Contains the script `github-merge.sh` for merging github pull requests securely
 ### [Linearize](/contrib/linearize) ###
 Construct a linear, no-fork, best version of the blockchain.
 
-### [PyMiner](/contrib/pyminer) ###
-
-This is a 'getwork' CPU mining client for Bitcoin. It is pure-python, and therefore very, very slow.  The purpose is to provide a reference implementation of a miner in order to study and develop other mining programs.
-
 ### [Qos](/contrib/qos) ###
 
 A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.