Merge pull request #162 from doowb/master

Updating currentPage to page
Merge pull request #163 from doowb/master

Fixing filename, adding dirname, and updating tests
updating to add data from the same file as the page name to the page context