Edits to move all output to the output directory
Merge pull request #75 from mikewesthad/master

Edits to move all outputs to the output directory + HTML bugfix