Fixup account templates

  - An extra comma in the password reset email template was causing an error.
  - Standardize on 'content' as the main block for all pages
  - Reorder installed apps to allow for overriding django.contrib templates