Merge pull request #35 from fleur/master

(refactore) render_data to use updated API
added more tests to template.rs