undid a twiddle I did to see if it would run faster
Committed after updating Xcode
Now building frameworks and linking properly
Merge branch 'master' of /Users/jamie/src/JHWaveformView/

Conflicts:
	JHWaveformView.xcodeproj/project.pbxproj
	JHWaveformView.xcodeproj/project.xcworkspace/xcuserdata/jamie.xcuserdatad/UserInterfaceState.xcuserstate