- Template modules now generate a JSON "metadata" structure at the bottom
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.
- improve the line counting to take place in the printer; the state
is also tracked for the template as a whole whereas before it was
only occurring for the top level node and was therefore incomplete
Merge branch 'master' of bitbucket.org:zzzeek/mako into w_json_metadata
Merge branch 'master' into w_json_metadata

Conflicts:
	doc/build/changelog.rst
- add module source thing as ModuleInfo.get_module_source_metadata
- Fixed bug in ``decode.<encoding>`` filter where a non-string object
would not be correctly interpreted in Python 3.
- switch to argparse for cmdline template runner
- write a test suite for cmdline
- start using context manager helpers in tests.  intrinsic here is that
we're going to go 1.0 and drop at least 2.4 and probably 2.5
- update .gitignore
- will now be 1.0
- drop python 2.4, 2.5 support
- various pep8ing
Merge branch 'w_json_metadata'