Latest from Jasen

Merged Gregs changes.
Added syntax highlighting.
Regenerated Javadocs.