Merge pull request #271 from csmith/master

Bump some dependencies.
Remove annoying build hack.