Merge pull request #34 from jangahroo/master

(refactor) parser now working properly
refactored render_data to use updated API
removed unused variable from function prototypes in template.rs
was writing out at the end of the main match, even though the write is handled earlier in some cases
Merge pull request #35 from fleur/master

(refactore) render_data to use updated API
(test) added more robust test suite for parser