nico/complete — pull request #1 by thesamprice (2012-12-12 05:11:34+00:00)
Title: Builds again with newest version of clang

Mostly just figuring out things that got renamed over the past couple
of years.