Minor fixes to handle updates to OS X version 10.10, CMake Version 3.1 and Boost version 1.57.
Another update in preparation for CMake 3.1.
Merge pull request #170 from Fraser999/MAID-457

Minor fixes to handle updates to OS X version 10.10, CMake Version 3.1 a...
Merge remote-tracking branch 'upstream/next' into clang_format