A few more tokens
Attempts to get automatic save-to-file working

Also allows for working on Ubuntu 14.04 with just the HUM
language model installed...