Having a boost directory in the repo causes git to see the directory as modified when CMake external project updates.
Use Boost 1.54 (temporarily) for OS X builds until 1.56 is available. Necessary because boost atomic does not build with the latest clang.
Merge remote-tracking branch 'upstream/master'