Fix C++11 compile errors on Mac OS X 10.9 and LLVM 5.1.
Merge pull request #333 from michaelbrundage/master

Fix C++11 compile errors on Mac OS X 10.9 and LLVM 5.1.