made universal iOS/OS X framework

Makes the framework build for OS X and iOS. We have to wait for OS X 10.10 for it to build properly, but I have tried this successfully with other projects and it works.