Bump boost version to 1.54
Fix CMake build under OSX and Linux