refactoring, most likely
Merge branch 'master' of https://github.com/altschuler/spaced