Implemented various things; mostly just trying to get the codebase back in sync
added xcode6 fix from previous commit
Merge remote-tracking branch 'wire-xcode/master'