merge "docs" - a lot of documentation updates and some small refactorings
templates should render in the package context by default