null safe data objects for templating

This is the more limited pull request you requested.  Wait what?
Just Null Safe Templates and Tests that's all