Minor fixes to handle updates to OS X version 10.10, CMake Version 3.1 a...

...nd Boost version 1.57.