Rejig the advanced save options so that they're nicer to use under Swift, and work around some warnings in Xcode 6.1
Xcode 6.1 upgrade checks