Adopted changes from https://github.com/kif-framework/KIF/issues/421

Adopted the changes I described in the KIF project.  I also migrated the code to Swift 1.1 since I was having trouble getting my Xcode 6.0 simulator working this morning, just minor tweaks to enums there.