Remove hypothetical support for drifts with HOTP
Simplify ToptTests a bit
Squash model changes as UserAuthToken
Change default type of UserAuthToken to TYPE_TOTP

for backwards compatibility