Created a single universal Mac+iOS framework

This would also be reverting recent changes.