Fixed small bugs
Merge branch 'dev' of https://github.com/knagra/farnsworth into dev

Conflicts:
	threads/views.py