- PR is done, fixes #236

Signed-off-by: Cody Taylor <codemister99@yahoo.com>

- changelog for pullreq bitbucket:11

- drop python 2.4, 2.5 support
- various pep8ing

would not be correctly interpreted in Python 3.

Conflicts:
	doc/build/changelog.rst

would not be correctly interpreted in Python 3.

when a "try/except" targeted a tuple of exception types, rather
than a single exception. fixes #227

of the source file which includes parseable information about the
templates' source file, encoding etc. as well as a mapping of module
source lines to template lines, thus replacing the "# SOURCE LINE"
markers throughout the source code.  The structure also indicates those
lines that are explicitly not part of the template's source; the goal
here is to allow integration with coverage tools.

- move CHANGES to changelog.rst