Update code to match square's coding style
Revert to the original version of SocketRocket