Conformed to Xcode6-Beta3.

Swifter is being tested on branch test but needs a way of patching only changes between test and test-<file> branches so as to not merge workarounds into master.