Fixed a nasty bug with if/when.
Corrected the org-mode directory on gollum.
Use the default fault unless we're on Windows.