Changed lots of peer use, and changed the peerstore to ensure there is only ever one peer in use. Fixed #174
