Use multiple-state handling to implement a remember token
Merge branch 'master' of github.com:metabrainz/geordi