Merge/upstream 2014 10 01 xcode6

pulled latest from upstream KIF.

Where there were conflicts around local changes, for the initial pass, I let upstream win. I'm going through and commenting on these conflicts to make sure we review and don't miss changes that were made which may break tests