whitespace creep, spelling, indentation

from anchor/machiavelli#69