Merge branch 'TestSPDY'

Conflicts:

SkinLab.xcworkspace/xcuserdata/thewingofthesky.xcuserdatad/UserInterface
State.xcuserstate