Merge pull request #1 from vibraphone/smtk-head

Fix for Mavericks (and other systems using libc++). Eliminate warnings.