Added support for templates and other wiki text in file argument
Did some minor refactoring
Merge pull request #4 from netbrain/master

Added support for templates and other wiki text in file argument