Xcode 6.1 fixes
Centralize logging and escape message. Fixes #117.