Fix malformatted header line, and prefer defvar to top-level setq
Merge pull request #120 from purcell/patch-4

Fix malformatted header line, and prefer defvar to top-level setq