System config fixes

This fixes breakage in master.  #251 was merged before the Buildbot finished, and it turned out I'd added some really dumb bugs at the very last second.

Hopefully this will fix the problems.  Maintainers:  please wait until the [Buildbot][1] succeeds before merging!

[1]: http://buildbot.dovetail-automata.com/grid