Catch erroneous exception throw in RiakWrappedSocket.close()
PEP8 fix
Merge pull request #347 from basho/bugfix/bch/timeout-test

Attempt to fix exception thrown in test_index_timeout()