left over tweaks from master
Merge branch 'master' into refactor1

Conflicts:
	notes/models.py
	requirements.txt