cherry picking https://github.com/square/SocketRocket/pull/74 and fixing merge conflicts

SRWebSocketTests/SRTAutobahnTests.m

@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 #import <XCTest/XCTestRun.h>
-#import "SRWebSocket.h"
+#import <SocketRocket/SRWebSocket.h>
 #import "SRTWebSocketOperation.h"
 #import "SenTestCase+SRTAdditions.h"
 

SRWebSocketTests/SRTWebSocketOperation.h

@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "SRWebSocket.h"
+#import <SocketRocket/SRWebSocket.h>
 
 @interface SRTWebSocketOperation : NSOperation <SRWebSocketDelegate>
 

SRWebSocketTests/SRTWebSocketOperation.m

@@ -7,7 +7,6 @@
 //
 
 #import "SRTWebSocketOperation.h"
-#import "SRWebSocket.h"
 
 @interface SRTWebSocketOperation ()
 

SocketRocket.xcodeproj/project.pbxproj

@@ -690,6 +690,7 @@
 				);
 				OTHER_LDFLAGS = "-Licucore";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PUBLIC_HEADERS_FOLDER_PATH = include/$PRODUCT_NAME;
 				SKIP_INSTALL = YES;
 			};
 			name = Debug;
@@ -708,6 +709,7 @@
 				);
 				OTHER_LDFLAGS = "-Licucore";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PUBLIC_HEADERS_FOLDER_PATH = include/$PRODUCT_NAME;
 				SKIP_INSTALL = YES;
 			};
 			name = Release;

TestChat/TCViewController.m

@@ -7,7 +7,7 @@
 //
 
 #import "TCViewController.h"
-#import "SRWebSocket.h"
+#import <SocketRocket/SRWebSocket.h>
 #import "TCChatCell.h"
 
 @interface TCMessage : NSObject