Issue167

A reimplementation of the simplate system, using [-----] as the page separator instead of ^L. Has (mostly) updated tests.