go back to extracting vars in local scope for partials
rewrite with emphasis on file-based templates
Merge pull request #64 from pmjones/develop-2

Revert to older way of passing vars to partials