Generate both html and jshtml
Merge pull request #13 from ianbarber/master

Generate both html and jshtml