Partial commit.
(partial) Fixed most buy and bc incompatibilities
Code cosmetics
Merge branch 'master' into stpl3
Turned StplParser.syntax into a property.
Fixed some comments.
SimpleTemplate now accepts non-utf8 source to maintain bc.
Lots of tests for the new multiblock template syntax and some fixes and improvements in the template parser code.
Merge branch 'master' into stpl3
typo
Merge branch 'master' into stpl3

Conflicts:
	bottle.py
fixed bug in resounce manager lookup
fixed some test for nosetest compatibility
Added __pycache__ to make clean
Fixed unittest deprecation warning
Speed up make clean
Added 'make coverage'
Fixed some unit tests, added to coverage
Changelog