fixed some package names and imports
Merge branch 'master' of https://github.com/altschuler/spaced
temp commit
Merge branch 'master' of https://github.com/altschuler/spaced
Merge branch 'tmps'