PEP8 & cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/widgets/comment_show.html