Template upgrades

Here's the `next` version.

Aside: I'm having trouble running the tests under tox. Firstly I had to add:

     [testenv:py25-1.4.X]
     basepython = python2.5
    +setenv =
    +    PIP_INSECURE = 1

So that Python 2.5 wouldn't complain about SSL support. (see https://bitbucket.org/hpk42/tox/issue/91/python-25-support )

But I'm still getting:

    ImportError: Could not import settings 'tests.settings' (Is it on sys.path?): No module named tests.settings

Where is the `tests.settings` module supposed to come from?