jguiditta/tim — pull request #1 by jguiditta (2012-10-10 17:42:47+00:00)
Title: Templates and nesting fixes

Seeing if this pull request still fails travis