Further fixes from code review.

Added boost to CMakeLists.txt, reverted whitespace change.