minor formatting tweaks, re-sorting imports
updated formatting, made spacing around template tag/filter delimiters consistent