Merge pull request #23 from csmith/master

Switch some file usages to paths.
Change some more files to paths.

The updater code is horrid. In most cases I've just bailed out by
converting to a file.

Issue #24
Merge remote-tracking branch 'origin/master'