Some fixes for OSX compilation.  Closes #450

Is there a reason to not use libc++ everywhere with clang?