Support {% trans .. as .. %} tag (#131)
Fix bug in new scope routine (#101)

When there was some text surrounding the sub scope,
it only kept the last piece.
Tests updated to catch this.