Switch to using CocoaPods to manage dependencies
Fix up some merge conflicts