Make backup token cleanup more robust.
Merge branch 'master' of github.com:sandstorm-io/sandstorm