URL syntax updated for django >= 1.4.3 / 1.3.5 / 1.5
PEP8
Add context to display_comment_toplevel_for, required by {% csrf_token %}
Various small mergings
merging with vhf