Updated Snap and Heist

Introduced changes needed for 0.10+ compatibility.
Still not using compiled templates, however.