Not using pandoc anymore et al...

* Styled to match web site
* Edited makefile for using gimli
* updated output files