PEP8 pass.
Started websocket tests.  Something is wrong with the crosstest decorator though.