Address keybase/keybase-issues#219

Most robust to spurious whitepsaces
changes