From: https://github.com/jakearchibald/pystache/commit/a936076fd5c06f49c8a7307060861807d8245ffe
Into: issue_46

The failed unit test now passes.

Conflicts:
	pystache/template.py