Minor refactoring
Merge branch 'master' of https://github.com/activityhistory/selfspy into UI_experiment

Conflicts:
	selfspy/reviewer.py