did a little refactoring to get rid of WebSocketImpl.socket and because of #159
Merge branch 'master' of https://github.com/ck1125/Java-WebSocket
Merge branch 'master' of github.com:TooTallNate/Java-WebSocket
Fixed situation in which a connection would not be closed by the server if the client connects via ws also the server expects wss